From: Derrick Stolee Date: Tue, 19 Jul 2022 18:33:43 +0000 (+0000) Subject: sequencer: ignore HEAD ref under --update-refs X-Git-Tag: v2.38.0-rc0~114^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa37f3e1d892698276b52f347c6374499f6c0759;p=thirdparty%2Fgit.git 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 Signed-off-by: Derrick Stolee Signed-off-by: Junio C Hamano --- diff --git a/sequencer.c b/sequencer.c index 20ca7b4435..f85aa6b1f7 100644 --- a/sequencer.c +++ b/sequencer.c @@ -5888,12 +5888,25 @@ static int add_decorations_to_list(const struct commit *commit, struct todo_add_branch_context *ctx) { const struct name_decoration *decoration = get_name_decoration(&commit->object); + const char *head_ref = resolve_ref_unsafe("HEAD", + RESOLVE_REF_READING, + NULL, + NULL); while (decoration) { struct todo_item *item; const char *path; size_t base_offset = ctx->buf->len; + /* + * If the branch is the current HEAD, then it will be + * updated by the default rebase behavior. + */ + if (head_ref && !strcmp(head_ref, decoration->name)) { + decoration = decoration->next; + continue; + } + ALLOC_GROW(ctx->items, ctx->items_nr + 1, ctx->items_alloc);