From: Bagas Sanjaya <bagasdotme@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Cc: Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH v2] symbolic-ref: teach "--[no-]recurse" option
Date: Sat, 8 Oct 2022 16:37:00 +0700 [thread overview]
Message-ID: <0b44cdca-3115-e09e-70c8-6f56101c3d9c@gmail.com> (raw)
In-Reply-To: <xmqqsfjzaq78.fsf@gitster.g>
On 10/8/22 11:34, Junio C Hamano wrote:
> Suppose you are managing many maintenance tracks in your project,
> and some of the more recent ones are maint-2.36 and maint-2.37.
> Further imagine that your project recently tagged the official 2.38
> release, which means you would need to start maint-2.38 track soon,
> by doing:
>
> $ git checkout -b maint-2.38 v2.38.0^0
> $ git branch --list 'maint-2.3[6-9]'
> * maint-2.38
> maint-2.36
> maint-2.37
>
> So far, so good. But it also is reasonable to want not to have to
> worry about which maintenance track is the latest, by pointing a
> more generic-sounding 'maint' branch at it, by doing:
>
> $ git symbolic-ref refs/heads/maint refs/heads/maint-2.38
>
> which would allow you to say "whichever it is, check out the latest
> maintenance track", by doing:
>
> $ git checkout maint
> $ git branch --show-current
> maint-2.38
>
> It is arguably better to say that we are on 'maint-2.38' rather than
> on 'maint', and "git merge/pull" would record "into maint-2.38" and
> not "into maint", so I think what we have is a good behaviour.
>
> One thing that is slightly irritating, however, is that I do not
> think there is a good way (other than "cat .git/HEAD") to learn that
> you checked out 'maint' to get into that state. Just like the output
> of "git branch --show-current" shows above, "git symbolic-ref HEAD"
> would report 'refs/heads/maint-2.38', bypassing the intermediate
> symbolic ref at 'refs/heads/maint' that is pointed at by HEAD.
>
> The internal resolve_ref() API already has the necessary support for
> stopping after resolving a single level of a symbolic-ref, and we
> can expose it by adding a "--[no-]recurse" option to the command.
>
The example case above is from recent Git releases, right?
I think the wording should instead use generalized version numbers.
For example the still maintained release tracks are X.Y-1 and X.Y,
but now X+1 have been tagged, which creates X+1.Y track.
Thanks.
--
An old man doll... just what I always wanted! - Clara
next prev parent reply other threads:[~2022-10-08 9:37 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-07 22:00 [PATCH] symbolic-ref: teach "--[no-]recurse" option Junio C Hamano
2022-10-08 3:35 ` Eric Sunshine
2022-10-08 4:20 ` Junio C Hamano
2022-10-08 4:34 ` [PATCH v2] " Junio C Hamano
2022-10-08 4:54 ` Eric Sunshine
2022-10-09 4:41 ` Junio C Hamano
2022-10-08 9:37 ` Bagas Sanjaya [this message]
2022-10-09 12:47 ` Junio C Hamano
2022-10-08 12:28 ` Philip Oakley
2022-10-08 15:28 ` Philip Oakley
2022-10-09 12:07 ` Junio C Hamano
2022-10-11 14:49 ` Philip Oakley
2022-10-09 22:13 ` [PATCH v3] " Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0b44cdca-3115-e09e-70c8-6f56101c3d9c@gmail.com \
--to=bagasdotme@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).