diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-11 18:34:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-11 18:34:32 -0800 |
| commit | edb6ad5b0aa7152dc230c0e75f14fb41b8302db4 (patch) | |
| tree | 4171bb3c75d9fa06a9f053a276869c64ccf302c3 /run-command.c | |
| parent | c566ea13fd25be8a7c20bdf3644d1ebe3f65b690 (diff) | |
| parent | 709ca730f8e093005cc882bfb86c0ca9c83d345b (diff) | |
| download | git-edb6ad5b0aa7152dc230c0e75f14fb41b8302db4.tar.gz | |
Merge branch 'jk/unify-exit-code-by-receiving-signal'
The internal logic had to deal with two representations of a death
of a child process by a signal.
* jk/unify-exit-code-by-receiving-signal:
run-command: encode signal death as a positive integer
Diffstat (limited to 'run-command.c')
| -rw-r--r-- | run-command.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/run-command.c b/run-command.c index 24eaad5c66..04712191e8 100644 --- a/run-command.c +++ b/run-command.c @@ -249,7 +249,7 @@ static int wait_or_whine(pid_t pid, const char *argv0) * mimics the exit code that a POSIX shell would report for * a program that died from this signal. */ - code -= 128; + code += 128; } else if (WIFEXITED(status)) { code = WEXITSTATUS(status); /* |