diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-30 23:07:08 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-30 23:07:08 +0300 |
| commit | 54bc41416c5d3ecb978acb0df80d57aa3e54494c (patch) | |
| tree | a804b8e346b9f79bc461cdb52686d805ff69d535 /builtin/merge-file.c | |
| parent | f60b5dc68cdb7a75e148c5b98238a880363cf870 (diff) | |
| parent | e34f80278e920e53b69016c7cecb24e4621e4564 (diff) | |
Merge branch 'jk/merge-file-exit-code'
"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; } |