From: Phillip Wood <phillip.wood123@gmail.com>
To: git@vger.kernel.org
Cc: Long 76 <long76.git@mail.ru>, Matt Hunter <m@lfurio.us>,
Phillip Wood <phillip.wood123@gmail.com>
Subject: [PATCH 0/3] sequencer: fix cleanup of REBASE_HEAD and AUTO_MERGE
Date: Tue, 27 Oct 2026 10:57:54 +0000 [thread overview]
Message-ID: <cover.1793098652.git.phillip.wood@dunelm.org.uk> (raw)
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 reply other threads:[~2026-10-27 10:58 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-27 10:57 Phillip Wood [this message]
2026-10-27 10:57 ` [PATCH 1/3] test_ref_missing(): improve error message Phillip Wood
2026-10-27 20:00 ` Junio C Hamano
2026-10-27 10:57 ` [PATCH 2/3] sequencer: remove REBASE_HEAD at the end of a rebase Phillip Wood
2026-10-27 20:10 ` Junio C Hamano
2026-10-27 10:57 ` [PATCH 3/3] sequencer: remove AUTO_MERGE " Phillip Wood
2026-10-27 20:11 ` Junio C Hamano
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=cover.1793098652.git.phillip.wood@dunelm.org.uk \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=long76.git@mail.ru \
--cc=m@lfurio.us \
--cc=phillip.wood@dunelm.org.uk \
/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