general improvements

diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh
index 39e348de163b722c792e1576a4ab2af62757fd79..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
 '