summaryrefslogtreecommitdiff
path: root/editor.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-14 08:01:27 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-14 08:01:27 -0800
commit750a6cacf49dd57a4b4891ffdbd63191180273da (patch)
tree43d467def1e540b1b9902d5ef54f1de578c5aaf9 /editor.c
parent32a03dc165e2a65fdb20a4ddbe51eaa1e5f52c5b (diff)
parent709ca730f8e093005cc882bfb86c0ca9c83d345b (diff)
downloadgit-750a6cacf49dd57a4b4891ffdbd63191180273da.tar.gz
Merge branch 'jk/unify-exit-code-by-receiving-signal' into maint
* jk/unify-exit-code-by-receiving-signal: run-command: encode signal death as a positive integer
Diffstat (limited to 'editor.c')
-rw-r--r--editor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/editor.c b/editor.c
index 065a7abf2f..27bdecdaf3 100644
--- a/editor.c
+++ b/editor.c
@@ -51,7 +51,7 @@ int launch_editor(const char *path, struct strbuf *buffer, const char *const *en
sigchain_push(SIGINT, SIG_IGN);
sigchain_push(SIGQUIT, SIG_IGN);
ret = finish_command(&p);
- sig = ret + 128;
+ sig = ret - 128;
sigchain_pop(SIGINT);
sigchain_pop(SIGQUIT);
if (sig == SIGINT || sig == SIGQUIT)