Merge branch 'ab/subtree-doc'

diff --git a/t/t4116-apply-reverse.sh b/t/t4116-apply-reverse.sh
index 2298ece8019d79ef718ef658bdac74493d265b92..1e4d4380bf01c081aeb1df44cef40319063f2faa 100755 (executable)
--- a/t/t4116-apply-reverse.sh
+++ b/t/t4116-apply-reverse.sh
@@ -48,12 +48,12 @@ test_expect_success 'apply in reverse' '
 
 test_expect_success 'setup separate repository lacking postimage' '
 
-       git tar-tree initial initial | $TAR xf - &&
+       git archive --format=tar --prefix=initial/ initial | $TAR xf - &&
        (
                cd initial && git init && git add .
        ) &&
 
-       git tar-tree second second | $TAR xf - &&
+       git archive --format=tar --prefix=second/ second | $TAR xf - &&
        (
                cd second && git init && git add .
        )