kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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

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
maint
Junio C Hamano 2025-10-15 10:29:27 -07:00
parent 8c3d7c5f11 4d491ade8f
commit d549c188be
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sequencer.c
View File

@ -2721,6 +2721,7 @@ static int check_merge_commit_insn(enum todo_command command)
return error(_("cannot squash merge commit into another commit")); return error(_("cannot squash merge commit into another commit"));


case TODO_MERGE: case TODO_MERGE:
case TODO_DROP:
return 0; return 0;


default: default:

1
t/t3404-rebase-interactive.sh
View File

@ -2263,6 +2263,7 @@ test_expect_success 'non-merge commands reject merge commits' '
edit $oid edit $oid
fixup $oid fixup $oid
squash $oid squash $oid
drop $oid # acceptable, no advice
EOF EOF
( (
set_replace_editor todo && set_replace_editor todo &&