author | Junio C Hamano <gitster@pobox.com> | |
Tue, 11 Aug 2009 05:14:57 +0000 (22:14 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 11 Aug 2009 05:14:57 +0000 (22:14 -0700) |
* 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
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
1 | 2 | |||
---|---|---|---|---|
builtin-merge.c | patch | | diff1 | | diff2 | | blob | history |
git.c | patch | | diff1 | | diff2 | | blob | history |
ll-merge.c | patch | | diff1 | | diff2 | | blob | history |
run-command.c | patch | | diff1 | | diff2 | | blob | history |
t/t5530-upload-pack-error.sh | patch | | diff1 | | diff2 | | blob | history |
transport.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin-merge.c
Simple merge
diff --cc git.c
Simple merge
diff --cc ll-merge.c
Simple merge
diff --cc run-command.c
Simple merge
diff --cc t/t5530-upload-pack-error.sh
index 757cc19ecce127ddd0cbf528f7678c2940ac1519,82ca3003dd2cd3c15b10280690e9ac829dc7c1eb..a696b8791b7caa44ae2bd16d6970a791f3a28d3d
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
+ # 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' '
+
+ ! 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 &&
diff --cc transport.c
Simple merge