Custom low-level merge driver: change the configuration scheme.

[git.git] / t / t5000-tar-tree.sh

diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index ac835fe4317b7a37d77205487066d8f10bd71422..e223c074f043571ff868a2f4783c7cc155185004 100755 (executable)
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -49,9 +49,17 @@ test_expect_success \
      git-update-ref HEAD $(TZ=GMT GIT_COMMITTER_DATE="2005-05-27 22:00:00" \
      git-commit-tree $treeid </dev/null)'
 
+test_expect_success \
+    'git-archive' \
+    'git-archive HEAD >b.tar'
+
 test_expect_success \
     'git-tar-tree' \
-    'git-tar-tree HEAD >b.tar'
+    'git-tar-tree HEAD >b2.tar'
+
+test_expect_success \
+    'git-archive vs. git-tar-tree' \
+    'diff b.tar b2.tar'
 
 test_expect_success \
     'validate file modification time' \
@@ -130,4 +138,8 @@ test_expect_success \
     'validate file contents with prefix' \
     'diff -r a e/prefix/a'
 
+test_expect_success \
+    'git-archive --list outside of a git repo' \
+    'GIT_DIR=some/non-existing/directory git-archive --list'
+
 test_done