Merge fixes up to GIT 1.0.6

This commit is contained in:
Junio C Hamano
2005-12-27 18:13:30 -08:00
5 changed files with 9 additions and 6 deletions

View File

@ -168,7 +168,7 @@ test_expect_success \
: sum of the index file itself &&
l=`wc -c <test-3.idx` &&
l=`expr "$l" - 20` &&
l=`expr $l - 20` &&
cp test-1-${packname_1}.pack test-3.pack &&
dd if=/dev/zero of=test-3.idx count=20 bs=1 conv=notrunc seek=$l &&
if git-verify-pack test-3.pack

View File

@ -110,7 +110,7 @@ save_tag g4 unique_commit g6 tree -p g3 -p h2
git-update-ref HEAD $(tag l5)
test_expect_success 'rev-list has correct number of entries' 'git-rev-list HEAD | wc -l | tr -s " "' <<EOF
test_output_expect_success 'rev-list has correct number of entries' 'git-rev-list HEAD | wc -l | tr -d \" \"' <<EOF
19
EOF

View File

@ -79,7 +79,7 @@ save_tag g4 unique_commit g6 tree -p g3 -p h2
git-update-ref HEAD $(tag l5)
test_expect_success 'rev-list has correct number of entries' 'git-rev-list HEAD | wc -l | tr -s " "' <<EOF
test_output_expect_success 'rev-list has correct number of entries' 'git-rev-list HEAD | wc -l | tr -d \" \"' <<EOF
19
EOF