Merge branch 'maint'

* maint:
  Makefile: fix shell quoting
  tests: propagate $(TAR) down from the toplevel Makefile
  index-pack.c: correctly initialize appended objects
  send-email: find body-encoding correctly
This commit is contained in:
Junio C Hamano
2008-07-25 13:56:36 -07:00
4 changed files with 15 additions and 8 deletions

View File

@ -25,7 +25,6 @@ commit id embedding:
'
. ./test-lib.sh
TAR=${TAR:-tar}
UNZIP=${UNZIP:-unzip}
SUBSTFORMAT=%H%n
@ -77,7 +76,7 @@ test_expect_success \
test_expect_success \
'validate file modification time' \
'mkdir extract &&
$TAR xf b.tar -C extract a/a &&
"$TAR" xf b.tar -C extract a/a &&
perl -e '\''print((stat("extract/a/a"))[9], "\n")'\'' >b.mtime &&
echo "1117231200" >expected.mtime &&
diff expected.mtime b.mtime'
@ -89,7 +88,7 @@ test_expect_success \
test_expect_success \
'extract tar archive' \
'(cd b && $TAR xf -) <b.tar'
'(cd b && "$TAR" xf -) <b.tar'
test_expect_success \
'validate filenames' \
@ -106,7 +105,7 @@ test_expect_success \
test_expect_success \
'extract tar archive with prefix' \
'(cd c && $TAR xf -) <c.tar'
'(cd c && "$TAR" xf -) <c.tar'
test_expect_success \
'validate filenames with prefix' \
@ -126,7 +125,7 @@ test_expect_success \
test_expect_success \
'extract substfiles' \
'(mkdir f && cd f && $TAR xf -) <f.tar'
'(mkdir f && cd f && "$TAR" xf -) <f.tar'
test_expect_success \
'validate substfile contents' \
@ -138,7 +137,7 @@ test_expect_success \
test_expect_success \
'extract substfiles from archive with prefix' \
'(mkdir g && cd g && $TAR xf -) <g.tar'
'(mkdir g && cd g && "$TAR" xf -) <g.tar'
test_expect_success \
'validate substfile contents from archive with prefix' \