Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: mail@abhinavg.net,  git@vger.kernel.org,
	 Derrick Stolee <stolee@gmail.com>
Subject: Re: [PATCH] rebase: ignore non-branch update-refs
Date: Mon, 11 May 2026 08:37:23 +0900	[thread overview]
Message-ID: <xmqqv7cu96q4.fsf@gitster.g> (raw)
In-Reply-To: <0911df2d-aaa2-456e-a678-345239cefc67@gmail.com> (Phillip Wood's message of "Sun, 10 May 2026 14:37:21 +0100")

Phillip Wood <phillip.wood123@gmail.com> writes:

>> Your long topic branch may have local unannotated tags that point
>> into the middle of it, marking strategic points in the topic.
>> 
>> With this change, the command no longer moves them when it rebases
>> the entire topic.  Isn't it a regression?
>
> sequencer.c:todo_list_add_update_ref_commands() calls 
> load_branch_decorations() so it does not update tags and the patch is 
> correct.

OK.  And with "%d", the existing versions of Git would have produced
something like

    pick 31e8fcabd8 # rebase: update-refs (HEAD -> rebase, tag: mark)
    update-ref HEAD
    update-ref refs/heads/rebase
    update-ref refs/tags/mark

it would have failed to work due to the "HEAD" thing, so even though
existing versions of Git may have added such local tags to the insn
sequence, it would not have been a workable configuration anyway.

OK.  If we never supported such a workflow to use local tags as
markers, then the strategy taken by the posted patch to limit us to
local branch refs is a very good thing, I think.

  reply	other threads:[~2026-05-10 23:37 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-06  2:39 [PATCH] rebase: ignore non-branch update-refs mail
2026-05-07 16:08 ` Phillip Wood
2026-05-08  1:58 ` [PATCH v2] " mail
2026-05-08 10:07   ` Phillip Wood
2026-05-10 22:41   ` [PATCH v3 0/1] " mail
2026-05-10 22:41     ` [PATCH v3 1/1] " mail
2026-05-10  1:11 ` [PATCH] " Junio C Hamano
2026-05-10 13:37   ` Phillip Wood
2026-05-10 23:37     ` Junio C Hamano [this message]
2026-05-11  0:15       ` Abhinav Gupta
2026-05-11  0:20         ` Junio C Hamano
2026-05-11  0:33           ` Abhinav Gupta
2026-05-12 15:10         ` Phillip Wood
2026-05-15 15:40     ` Phillip Wood

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqv7cu96q4.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=mail@abhinavg.net \
    --cc=phillip.wood123@gmail.com \
    --cc=stolee@gmail.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox