From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 11 Aug 2009 05:14:57 +0000 (-0700)
Subject: Merge branch 'js/run-command-updates'
X-Git-Tag: v1.6.5-rc0~86
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=08ac69685a5b6bea45df1fd62ea1d9b7c0258d0b;p=git.git

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
---

08ac69685a5b6bea45df1fd62ea1d9b7c0258d0b
diff --cc t/t5530-upload-pack-error.sh
index 757cc19ec,82ca3003d..a696b8791
--- a/t/t5530-upload-pack-error.sh
+++ b/t/t5530-upload-pack-error.sh
@@@ -52,20 -51,14 +52,23 @@@ 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
+ 	# 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 &&