diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-05 21:38:29 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-05 21:38:29 +0200 |
| commit | 7d1b50981277c59a788298751f121567a1e75202 (patch) | |
| tree | f79499d734e14d789adb50cd76efc1ac4371d2c5 /t | |
| parent | Merge branch 'maint' (diff) | |
| parent | Shift object enumeration out of upload-pack (diff) | |
| download | git-7d1b50981277c59a788298751f121567a1e75202.tar.xz git-7d1b50981277c59a788298751f121567a1e75202.zip | |
Merge branch 'ne/futz-upload-pack'
* ne/futz-upload-pack:
Shift object enumeration out of upload-pack
Conflicts:
upload-pack.c
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5530-upload-pack-error.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/t/t5530-upload-pack-error.sh b/t/t5530-upload-pack-error.sh index f5102b902a..757cc19ecc 100755 --- a/t/t5530-upload-pack-error.sh +++ b/t/t5530-upload-pack-error.sh @@ -30,11 +30,12 @@ test_expect_success 'fsck fails' ' test_must_fail git fsck ' -test_expect_success 'upload-pack fails due to error in pack-objects' ' +test_expect_success 'upload-pack fails due to error in pack-objects packing' ' ! echo "0032want $(git rev-parse HEAD) 00000009done 0000" | git upload-pack . > /dev/null 2> output.err && + grep "unable to read" output.err && grep "pack-objects died" output.err ' @@ -51,11 +52,20 @@ test_expect_success 'fsck fails' ' test_expect_success 'upload-pack fails due to error in rev-list' ' ! echo "0032want $(git rev-parse HEAD) -00000009done +0034shallow $(git rev-parse HEAD^)00000009done 0000" | git upload-pack . > /dev/null 2> output.err && grep "waitpid (async) failed" output.err ' +test_expect_success 'upload-pack fails due to error in pack-objects enumeration' ' + + ! echo "0032want $(git rev-parse HEAD) +00000009done +0000" | git upload-pack . > /dev/null 2> output.err && + grep "bad tree object" output.err && + grep "pack-objects died" output.err +' + test_expect_success 'create empty repository' ' mkdir foo && |