From: Phillip Wood Date: Tue, 27 Oct 2026 10:57:56 GMT Subject: [PATCH 2/3] sequencer: remove REBASE_HEAD at the end of a rebase Message-ID: In-Reply-To: From: Phillip Wood When "git rebase" stops for an "edit" command, a rescheduled command, or for the user to resolve conflicts, it creates a ref called REBASE_HEAD pointing to the commit that is being picked. The ref is deleted at the start of each iteration of the loop that picks commits, but not after the loop ends. That means if there are conflicts on the last commit to be picked, REBASE_HEAD is left behind after the rebase finishes. Fix that by deleting REBASE_HEAD where it is created in do_commit() if the commit succeeds, and before we enter the loop in pick_commits() so that it is removed when continuing a rebase after a conflict resolution or failed commit. Several existing tests are extended to check that REBASE_HEAD is present when we stop for conflicts and is absent when the rebase finishes. Reported-by: Long 76 Reported-by: Matt Hunter Signed-off-by: Phillip Wood --- sequencer.c | 9 ++++++--- t/t3403-rebase-skip.sh | 4 +++- t/t3407-rebase-abort.sh | 2 ++ t/t3418-rebase-continue.sh | 8 ++++++-- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/sequencer.c b/sequencer.c index 2ac78e15b89..2d6a5f525c7 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1781,7 +1781,10 @@ static int do_commit(struct repository *r, if (is_rebase_i(opts) && oid) if (write_rebase_head(oid)) return -1; - return run_git_commit(msg_file, reflog_action, opts, flags); + res = run_git_commit(msg_file, reflog_action, opts, flags); + if (!res && is_rebase_i(opts) && oid) + refs_delete_ref(get_main_ref_store(r), "", "REBASE_HEAD", + NULL, REF_NO_DEREF); } return res; @@ -5178,6 +5181,8 @@ static int pick_commits(struct repository *r, unlink(rebase_path_amend()); unlink(rebase_path_patch()); unlink(git_path_merge_labels(r)); + refs_delete_ref(get_main_ref_store(r), "", "REBASE_HEAD", NULL, + REF_NO_DEREF); while (todo_list->current < todo_list->nr) { struct todo_item *item = todo_list->items + todo_list->current; @@ -5206,8 +5211,6 @@ static int pick_commits(struct repository *r, unlink(git_path_merge_head(r)); refs_delete_ref(get_main_ref_store(r), "", "AUTO_MERGE", NULL, REF_NO_DEREF); - refs_delete_ref(get_main_ref_store(r), "", "REBASE_HEAD", - NULL, REF_NO_DEREF); if (item->command == TODO_BREAK) { if (!opts->verbose) diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh index a1911c4a9d6..a2a5ac8ae01 100755 --- a/t/t3403-rebase-skip.sh +++ b/t/t3403-rebase-skip.sh @@ -97,10 +97,12 @@ test_expect_success 'moved back to branch correctly' ' test_debug 'gitk --all & sleep 1' -test_expect_success 'skipping final pick removes .git/MERGE_MSG' ' +test_expect_success 'skipping final pick removes REBASE_HEAD & .git/MERGE_MSG' ' test_must_fail git rebase --onto hello reverted-goodbye^ \ reverted-goodbye && + test_cmp_rev reverted-goodbye REBASE_HEAD && git rebase --skip && + test_ref_missing REBASE_HEAD && test_path_is_missing .git/MERGE_MSG ' diff --git a/t/t3407-rebase-abort.sh b/t/t3407-rebase-abort.sh index 9f49c4228b6..1703b5ae9b5 100755 --- a/t/t3407-rebase-abort.sh +++ b/t/t3407-rebase-abort.sh @@ -35,7 +35,9 @@ testrebase() { git reset --hard pre-rebase && test_must_fail git rebase$type main && test_path_is_dir "$state_dir" && + test_cmp_rev d REBASE_HEAD && git rebase --abort && + test_ref_missing REBASE_HEAD && check_head && test_path_is_missing "$state_dir" ' diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh index 8c43ef64fce..f35cd130921 100755 --- a/t/t3418-rebase-continue.sh +++ b/t/t3418-rebase-continue.sh @@ -28,7 +28,9 @@ test_expect_success 'merge based rebase --continue with works with touched file' FAKE_LINES="edit 1" git rebase -i HEAD^ && test-tool chmtime =-60 F1 && - git rebase --continue + test_cmp_rev commit-new-file-F2 REBASE_HEAD && + git rebase --continue && + test_ref_missing REBASE_HEAD ' test_expect_success 'merge based rebase --continue removes .git/MERGE_MSG' ' @@ -37,8 +39,10 @@ test_expect_success 'merge based rebase --continue removes .git/MERGE_MSG' ' test_must_fail git rebase --onto main HEAD^ && git read-tree --reset -u HEAD && test_path_is_file .git/MERGE_MSG && + test_cmp_rev commit-new-file-F2-on-topic-branch REBASE_HEAD && git rebase --continue && - test_path_is_missing .git/MERGE_MSG + test_path_is_missing .git/MERGE_MSG && + test_ref_missing REBASE_HEAD ' test_expect_success 'apply based rebase --continue works with touched file' ' -- 2.56.0.336.g97505d19352