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

gitster · gitster · commit bc44e9dc1bfb · 2025-08-07T08:25:55.000-07:00
During interactive rebase, using 'drop' on a merge commit lead to
an error, which was incorrect.

* 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
@@ -2263,6 +2263,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
`@@ -2263,6 +2263,7 @@ test_expect_success 'non-merge commands reject merge commits' '`
`2263`	`2263`	`edit $oid`
`2264`	`2264`	`fixup $oid`
`2265`	`2265`	`squash $oid`
	`2266`	`+ drop $oid # acceptable, no advice`
`2266`	`2267`	`EOF`
`2267`	`2268`	`(`
`2268`	`2269`	`set_replace_editor todo &&`