X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft5000-tar-tree.sh;h=fa62b6aa21f5d8f8774b7f2af3a4cd60b8c0d761;hb=efb779f8873e5aa36be29a4e551186c62c1b580c;hp=dca2067b2d0bcd4423d843561b9275be50fe0da3;hpb=7666cdedb4e73948690587cda61b256ea2367c56;p=git.git

diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index dca2067b2..fa62b6aa2 100755
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -109,9 +109,10 @@ test_expect_success \
     'diff -r a c/prefix/a'
 
 test_expect_success \
-    'create an archive with a substfiles' \
+    'create archives with substfiles' \
     'echo "substfile?" export-subst >a/.gitattributes &&
      git archive HEAD >f.tar &&
+     git archive --prefix=prefix/ HEAD >g.tar &&
      rm a/.gitattributes'
 
 test_expect_success \
@@ -126,6 +127,18 @@ test_expect_success \
       diff a/substfile2 f/a/substfile2
 '
 
+test_expect_success \
+    'extract substfiles from archive with prefix' \
+    '(mkdir g && cd g && $TAR xf -) <g.tar'
+
+test_expect_success \
+     'validate substfile contents from archive with prefix' \
+     'git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
+      >g/prefix/a/substfile1.expected &&
+      diff g/prefix/a/substfile1.expected g/prefix/a/substfile1 &&
+      diff a/substfile2 g/prefix/a/substfile2
+'
+
 test_expect_success \
     'git archive --format=zip' \
     'git archive --format=zip HEAD >d.zip'