]> git.ipfire.org Git - thirdparty/git.git/commit
rebase -i: permit 'drop' of a merge commit
authorJohannes Sixt <j6t@kdbg.org>
Wed, 6 Aug 2025 17:38:35 +0000 (19:38 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Aug 2025 18:49:35 +0000 (11:49 -0700)
commit4d491ade8f6597904a7b79ff5d34f8524f915ac2
treecf38fbe433d59e2a27c10f4193458e19f59af495
parenta1cf0cf13ab3a659ac77b7d749d6e5b11dc0142b
rebase -i: permit 'drop' of a merge commit

4c063c82e9 (rebase -i: improve error message when picking merge,
2024-05-30) added advice texts for cases when a merge commit is
passed as argument of sequencer command that cannot operate with
a merge commit. However, it forgot about the 'drop' command, so
that in this case the BUG() in the default branch is reached.

Handle 'drop' like 'merge', i.e., permit it without a message.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c
t/t3404-rebase-interactive.sh