diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-11-03 15:32:41 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-11-03 15:32:41 -0800 |
commit | 5c15ca0b3c866398f22cbab974d0a1964ef105ca (patch) | |
tree | f7c7b00472862c2665c05bf522836b6401dc4e8e /builtin/merge-file.c | |
parent | Merge branch 'dt/name-hash-dir-entry-fix' into maint (diff) | |
parent | merge-file: clamp exit code to maximum 127 (diff) | |
download | tgif-5c15ca0b3c866398f22cbab974d0a1964ef105ca.tar.xz |
Merge branch 'jk/merge-file-exit-code' into maint
"git merge-file" tried to signal how many conflicts it found, which
obviously would not work well when there are too many of them.
* jk/merge-file-exit-code:
merge-file: clamp exit code to maximum 127
Diffstat (limited to 'builtin/merge-file.c')
-rw-r--r-- | builtin/merge-file.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/merge-file.c b/builtin/merge-file.c index 50d0bc873b..55447053f2 100644 --- a/builtin/merge-file.c +++ b/builtin/merge-file.c @@ -104,5 +104,8 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix) free(result.ptr); } + if (ret > 127) + ret = 127; + return ret; } |