diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-10 22:14:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-10 22:14:57 -0700 |
| commit | 08ac69685a5b6bea45df1fd62ea1d9b7c0258d0b (patch) | |
| tree | 3f3ccdcda78c82ed450666d22a0b463cf3eac6b3 /t | |
| parent | 0c4f21e452dca5a705c36ca7e363c1a3b3c2a5b8 (diff) | |
| parent | 0b91322311b649a4b5f9581fec2dca9e1c2da716 (diff) | |
| download | git-08ac69685a5b6bea45df1fd62ea1d9b7c0258d0b.tar.gz git-08ac69685a5b6bea45df1fd62ea1d9b7c0258d0b.tar.xz | |
Merge branch 'js/run-command-updates'
* js/run-command-updates:
api-run-command.txt: describe error behavior of run_command functions
run-command.c: squelch a "use before assignment" warning
receive-pack: remove unnecessary run_status report
run_command: report failure to execute the program, but optionally don't
run_command: encode deadly signal number in the return value
run_command: report system call errors instead of returning error codes
run_command: return exit code as positive value
MinGW: simplify waitpid() emulation macros
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5530-upload-pack-error.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/t/t5530-upload-pack-error.sh b/t/t5530-upload-pack-error.sh index 757cc19ec..a696b8791 100755 --- a/t/t5530-upload-pack-error.sh +++ b/t/t5530-upload-pack-error.sh @@ -54,7 +54,10 @@ test_expect_success 'upload-pack fails due to error in rev-list' ' ! echo "0032want $(git rev-parse HEAD) 0034shallow $(git rev-parse HEAD^)00000009done 0000" | git upload-pack . > /dev/null 2> output.err && - grep "waitpid (async) failed" output.err + # pack-objects survived + grep "Total.*, reused" output.err && + # but there was an error, which must have been in rev-list + grep "bad tree object" output.err ' test_expect_success 'upload-pack fails due to error in pack-objects enumeration' ' |