Skip to content

Commit

Permalink
t5510: harden the way verify-pack is used
Browse files Browse the repository at this point in the history
The test ignored the exit status from verify pack command, and also relied
on not seeing any delta chain statistics.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Aug 8, 2009
1 parent d4900ee commit 2e674a9
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions t/t5510-fetch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ test_description='Per branch config variables affects "git fetch".

D=`pwd`

test_bundle_object_count () {
git verify-pack -v "$1" >verify.out &&
test "$2" = $(grep '^[0-9a-f]\{40\} ' verify.out | wc -l)
}

test_expect_success setup '
echo >file original &&
git add file &&
Expand Down Expand Up @@ -146,6 +151,7 @@ test_expect_success 'unbundle 1' '
test_must_fail git fetch "$D/bundle1" master:master
'


test_expect_success 'bundle 1 has only 3 files ' '
cd "$D" &&
(
Expand All @@ -156,8 +162,7 @@ test_expect_success 'bundle 1 has only 3 files ' '
cat
) <bundle1 >bundle.pack &&
git index-pack bundle.pack &&
verify=$(git verify-pack -v bundle.pack) &&
test 4 = $(echo "$verify" | wc -l)
test_bundle_object_count bundle.pack 3
'

test_expect_success 'unbundle 2' '
Expand All @@ -180,7 +185,7 @@ test_expect_success 'bundle does not prerequisite objects' '
cat
) <bundle3 >bundle.pack &&
git index-pack bundle.pack &&
test 4 = $(git verify-pack -v bundle.pack | wc -l)
test_bundle_object_count bundle.pack 3
'

test_expect_success 'bundle should be able to create a full history' '
Expand Down

0 comments on commit 2e674a9

Please sign in to comment.