Merge branch 'cvsserver' of http://locke.catalyst.net.nz/git/git-martinlanghoff; branch 'ml/cvsserver' into next

diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index 4db1bb11425797b5b105fcb7b92f443616d58355..adc5e937de1a4b28b9556ca00fdfbc95dead70d7 100755 (executable)
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -25,6 +25,7 @@ commit id embedding:
 '
 
 . ./test-lib.sh
+TAR=${TAR:-tar}
 
 test_expect_success \
     'populate workdir' \