Merge branch 'js/rebase-i-allow-drop-on-a-merge' into jch

gitster · gitster · commit 4a4df70045f3 · 2025-08-06T15:22:24.000-07:00
* js/rebase-i-allow-drop-on-a-merge:
  rebase -i: permit 'drop' of a merge commit
diff --git a/sequencer.c b/sequencer.c
@@ -2721,6 +2721,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:
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
@@ -2278,6 +2278,7 @@ test_expect_success 'non-merge commands reject merge commits' '
 	edit $oid
 	fixup $oid
 	squash $oid
+	drop $oid # acceptable, no advice
 	EOF
 	(
 		set_replace_editor todo &&

Original file line number	Diff line number	Diff line change
`@@ -2278,6 +2278,7 @@ test_expect_success 'non-merge commands reject merge commits' '`
`2278`	`2278`	`edit $oid`
`2279`	`2279`	`fixup $oid`
`2280`	`2280`	`squash $oid`
	`2281`	`+ drop $oid # acceptable, no advice`
`2281`	`2282`	`EOF`
`2282`	`2283`	`(`
`2283`	`2284`	`set_replace_editor todo &&`