git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 0/3] sequencer: fix cleanup of REBASE_HEAD and AUTO_MERGE

From
PWPhillip Wood <phillip.wood123@gmail.com>
Date
Oct 27, 2026, 10:57 UTC
Message-ID
<cover.1793098652.git.phillip.wood@dunelm.org.uk>

We had an error report [1] that REBASE_HEAD was still present after a rebase had finished. While looking at that I noticed the same could happen to AUTO_MERGE. These patches ensure those refs are removed by "git rebase --continue" so that they are not left behind after the rebase has finished.

Thanks to Long for the bug report and Matt for the confirmation
[1] https://lore.kernel.org/git/edfc868b-6be6-4871-a539-e70791db216d@mail.ru
base-commit: 7e34d8174dcda3435d1404c9a30bef46afe6c13e
Published-As: https://github.com/phillipwood/git/releases/tag/pw%2Fsequencer-delete-REBASE_HEAD%2Fv1
View-Changes-At: https://github.com/phillipwood/git/compare/7e34d8174...2fcb42a08
Fetch-It-Via: git fetch https://github.com/phillipwood/git pw/sequencer-delete-REBASE_HEAD/v1
Phillip Wood (3):
  test_ref_missing(): improve error message
  sequencer: remove REBASE_HEAD at the end of a rebase
  sequencer: remove AUTO_MERGE at the end of a rebase
 sequencer.c                | 13 ++++++++-----
 t/t3403-rebase-skip.sh     |  6 +++++-
 t/t3407-rebase-abort.sh    |  4 ++++
 t/t3418-rebase-continue.sh | 10 ++++++++--
 t/test-lib-functions.sh    |  6 ++++--
 5 files changed, 29 insertions(+), 10 deletions(-)
-- 
2.56.0.336.g97505d19352
Next: Phillip Wood
Message 1 of 7 in “sequencer: fix cleanup of REBASE_HEAD and AUTO_MERGE”
  1. 0/3 sequencer: fix cleanup of REBASE_HEAD and AUTO_MERGEPhillip Wood, Oct 27, 2026
  2. 1/3 test_ref_missing(): improve error messagePhillip Wood, Oct 27, 2026
  3. Junio C HamanoOct 27, 2026
  4. 2/3 sequencer: remove REBASE_HEAD at the end of a rebasePhillip Wood, Oct 27, 2026
  5. Junio C HamanoOct 27, 2026
  6. 3/3 sequencer: remove AUTO_MERGE at the end of a rebasePhillip Wood, Oct 27, 2026
  7. Junio C HamanoOct 27, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.