rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`

diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh
index 94cc532e108798691f1ec57db77733f0d92d0ff6..39e348de163b722c792e1576a4ab2af62757fd79 100755 (executable)
--- a/t/t3427-rebase-subtree.sh
+++ b/t/t3427-rebase-subtree.sh
@@ -82,11 +82,23 @@ test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges --
        verbose test "$(commit_message HEAD)" = "Empty commit"
 '
 
-# FAILURE: fatal: Could not parse object
-test_expect_failure 'Rebase -Xsubtree --onto commit' '
+test_expect_success 'Rebase -Xsubtree --keep-empty --onto commit' '
        reset_rebase &&
        git checkout -b rebase-onto to-rebase &&
-       git rebase -Xsubtree=files_subtree --onto files-master master &&
+       test_must_fail git rebase -Xsubtree=files_subtree --keep-empty --onto files-master master &&
+       : first pick results in no changes &&
+       git rebase --continue &&
+       verbose test "$(commit_message HEAD~2)" = "master4" &&
+       verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
+       verbose test "$(commit_message HEAD)" = "Empty commit"
+'
+
+test_expect_success 'Rebase -Xsubtree --keep-empty --rebase-merges --onto commit' '
+       reset_rebase &&
+       git checkout -b rebase-merges-onto to-rebase &&
+       test_must_fail git rebase -Xsubtree=files_subtree --keep-empty --rebase-merges --onto files-master --root &&
+       : first pick results in no changes &&
+       git rebase --continue &&
        verbose test "$(commit_message HEAD~2)" = "master4" &&
        verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
        verbose test "$(commit_message HEAD)" = "Empty commit"