]> git.ipfire.org Git - thirdparty/git.git/commit - sequencer.c
sequencer: ignore HEAD ref under --update-refs
authorDerrick Stolee <derrickstolee@github.com>
Tue, 19 Jul 2022 18:33:43 +0000 (18:33 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Jul 2022 19:49:04 +0000 (12:49 -0700)
commitaa37f3e1d892698276b52f347c6374499f6c0759
tree0fd58af5f692f2b5e8167a18ed874dd004cf8fc8
parent3113fedaeb67eed4c46ef7bdd670b8406317a303
sequencer: ignore HEAD ref under --update-refs

When using the 'git rebase -i --update-refs' option, the todo list is
populated with 'update-ref' commands for all tip refs in the history
that is being rebased. Refs that are checked out by some worktree are
instead added as a comment to warn the user that they will not be
updated.

Until now, this included the HEAD ref, which is being updated by the
rebase process itself, regardless of the --update-refs option. Remove
the comment in this case by ignoring any decorations that match the HEAD
ref.

Reported-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c