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 /ll-merge.c | |
| 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 'll-merge.c')
| -rw-r--r-- | ll-merge.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ll-merge.c b/ll-merge.c index 0571564dd..2d6b6d6cb 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -192,10 +192,6 @@ static int ll_ext_merge(const struct ll_merge_driver *fn, args[2] = cmd.buf; status = run_command_v_opt(args, 0); - if (status < -ERR_RUN_COMMAND_FORK) - ; /* failure in run-command */ - else - status = -status; fd = open(temp[1], O_RDONLY); if (fd < 0) goto bad; |