Merge branch 'js/gitdir-at-unc-root'

diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh
index 7a37235768574db87e76b3659ca4cfd39f248563..bec48e6a1f99a5d5db91b392987ff5b64cf16781 100755 (executable)
--- a/t/t3427-rebase-subtree.sh
+++ b/t/t3427-rebase-subtree.sh
@@ -59,7 +59,10 @@ test_expect_success 'setup' '
        test_commit files_subtree/master5 &&
 
        git checkout -b to-rebase &&
-       git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
+       git fast-export --no-data HEAD -- files_subtree/ |
+               sed -e "s%\([0-9a-f]\{40\} \)files_subtree/%\1%" |
+               git fast-import --force --quiet &&
+       git reset --hard &&
        git commit -m "Empty commit" --allow-empty
 '
 
@@ -93,4 +96,15 @@ test_expect_success 'Rebase -Xsubtree --keep-empty --onto commit' '
        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"
+'
+
 test_done