Date: Fri, 9 Apr 2021 18:11:56 +0800 From: Simon Wright <simon.wright@gmx.net> To: freebsd-ports@freebsd.org Subject: Re: Specific svn/git package update use case Message-ID: <59400e9a-5cce-fffd-decb-276dae1814ef@gmx.net> In-Reply-To: <8D6CD370-25E2-42C8-ADC8-B26D187D8577@yahoo.com> References: <8D6CD370-25E2-42C8-ADC8-B26D187D8577.ref@yahoo.com> <8D6CD370-25E2-42C8-ADC8-B26D187D8577@yahoo.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Excellent Mark, thank you, then that is exactly what I need, the git
equivilent of svn up -r xxxxxx ${portsdir}.
And is there a need to do git-commit or git-merge to deal with the
'detached HEAD' message or can I just suppress this? Any local
modifications live in an overlay for poudriere to use so there is
nothing unique in my /usr/ports and I only track main, no other branches.
On 09/04/2021 1:23 pm, Mark Millard via freebsd-ports wrote:
> Simon Wright simon.wright at gmx.net wrote on
> Fri Apr 9 02:48:47 UTC 2021 :
>
>> I'm still not clear though whether checking out this commit brings in
>> all the commits from git clone to this one or only this commit. My
>> reading seems to say that this is *only* this one commit which is not m=
y
>> need. Can anyone confirm this please?
>
> [My wording is not trying to be explicit about multi-branch
> merge points. Nor does it try to deal much with if you have
> local changes or staged changes in place at the time of the
> activity or if you have extra files not checked into git in
> the tree as well. And so on: a simple same-branch context.]
>
> A commit hash/id identifies everything on the branch at the
> time the commit finished, including what did not change
> compared to the prior commit on the branch. Checking out the
> commit spans all of it. Jumping forward (or backward) a bunch
> of commits on a branch does not require doing them one by one
> to get the net effect.
>
> You may want to inspect after checkouts (or similar activity)
> that "git status" does not display any surprises that need
> to be cleaned up in the local file system via some variant(s)
> of git restore or/and git clean or the like.
>
> =3D=3D=3D
> Mark Millard
> marklmi at yahoo.com
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?59400e9a-5cce-fffd-decb-276dae1814ef>