Merge branch 'jk/apply-similaritly-parsing' into maint

gitster · gitster · commit 66d12f97d071 · 2013-02-25T08:03:44.000-08:00
* jk/apply-similaritly-parsing:
  builtin/apply: tighten (dis)similarity index parsing
diff --git 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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1041,15 +1041,17 @@ static int gitdiff_renamedst(const char line, struct patch patch)`
`1041`	`1041`
`1042`	`1042`	`static int gitdiff_similarity(const char line, struct patch patch)`
`1043`	`1043`	`{`
`1044`		`- if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)`
`1045`		`- patch->score = 0;`
	`1044`	`+ unsigned long val = strtoul(line, NULL, 10);`
	`1045`	`+ if (val <= 100)`
	`1046`	`+ patch->score = val;`
`1046`	`1047`	`return 0;`
`1047`	`1048`	`}`
`1048`	`1049`
`1049`	`1050`	`static int gitdiff_dissimilarity(const char line, struct patch patch)`
`1050`	`1051`	`{`
`1051`		`- if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)`
`1052`		`- patch->score = 0;`
	`1052`	`+ unsigned long val = strtoul(line, NULL, 10);`
	`1053`	`+ if (val <= 100)`
	`1054`	`+ patch->score = val;`
`1053`	`1055`	`return 0;`
`1054`	`1056`	`}`
`1055`	`1057`