From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 8 Feb 2013 23:29:02 +0000 (-0800)
Subject: Merge branch 'jk/apply-similaritly-parsing'
X-Git-Tag: v1.8.2-rc0~32
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ecf6778e8ef243dd9b34eef57212c44baffb13a2?hp=d03d820a8c4b1eada9528e95baf9f39607034b97

Merge branch 'jk/apply-similaritly-parsing'

Make sure the similarity value shown in the "apply --summary"
output is sensible, even when the input had a bogus value.

* jk/apply-similaritly-parsing:
builtin/apply: tighten (dis)similarity index parsing
---

diff --git a/builtin/apply.c b/builtin/apply.c
index 9706ca73ab..080ce2ea3e 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -1041,15 +1041,17 @@ static int gitdiff_renamedst(const char *line, struct patch *patch)
 
 static int gitdiff_similarity(const char *line, struct patch *patch)
 {
-	if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
-		patch->score = 0;
+	unsigned long val = strtoul(line, NULL, 10);
+	if (val <= 100)
+		patch->score = val;
 	return 0;
 }
 
 static int gitdiff_dissimilarity(const char *line, struct patch *patch)
 {
-	if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
-		patch->score = 0;
+	unsigned long val = strtoul(line, NULL, 10);
+	if (val <= 100)
+		patch->score = val;
 	return 0;
 }