summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-11-03 23:32:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-11-03 23:32:41 (GMT)
commit5c15ca0b3c866398f22cbab974d0a1964ef105ca (patch)
treef7c7b00472862c2665c05bf522836b6401dc4e8e /builtin
parent3a27eec48ecfcc0764c90b3f478a124c01c082bc (diff)
parente34f80278e920e53b69016c7cecb24e4621e4564 (diff)
downloadgit-5c15ca0b3c866398f22cbab974d0a1964ef105ca.zip
git-5c15ca0b3c866398f22cbab974d0a1964ef105ca.tar.gz
git-5c15ca0b3c866398f22cbab974d0a1964ef105ca.tar.bz2
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')
-rw-r--r--builtin/merge-file.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index 50d0bc8..5544705 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;
}