From 4d491ade8f6597904a7b79ff5d34f8524f915ac2 Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Wed, 6 Aug 2025 19:38:35 +0200 Subject: 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 Signed-off-by: Junio C Hamano --- sequencer.c | 1 + 1 file changed, 1 insertion(+) (limited to 'sequencer.c') diff --git a/sequencer.c b/sequencer.c index 407ee4e90f..7a0b050b15 100644 --- a/sequencer.c +++ b/sequencer.c @@ -2683,6 +2683,7 @@ static int check_merge_commit_insn(enum todo_command command) return error(_("cannot squash merge commit into another commit")); case TODO_MERGE: + case TODO_DROP: return 0; default: -- cgit v1.3-5-g9baa