t3427: accommodate for the `rebase --merge` backend having been replaced
Since 68aa495b590 (rebase: implement --merge via the interactive machinery, 2018-12-11), the job of the old `--merge` backend is now performed by the `--interactive` backend, too. One consequence is that empty commits are no longer rebased by default. Meaning that the test case that calls `git rebase -Xsubtree` (which used to be handled by the `--merge` backend) now needs to ask explicitly for the empty commit to be rebased. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jul 31, 2019 at 08:18 UTC
f67336dabf8b77f1eee0341790c8fbbe5c6d81dd
1 file changed
+2
-2
t/t3427-rebase-subtree.sh
+2
-2
@@ -83,10 +83,10 @@ test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges --
83
'
84
85
# FAILURE: fatal: Could not parse object
86
-test_expect_failure 'Rebase -Xsubtree --onto commit' '
86
+test_expect_failure 'Rebase -Xsubtree --keep-empty --onto commit' '
87
reset_rebase &&
88
git checkout -b rebase-onto to-rebase &&
89
- git rebase -Xsubtree=files_subtree --onto files-master master &&
89
+ git rebase -Xsubtree=files_subtree --keep-empty --onto files-master master &&
90
verbose test "$(commit_message HEAD~2)" = "master4" &&
91
verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
92
verbose test "$(commit_message HEAD)" = "Empty commit"