merge-recursive: fix parsing of "diff-algorithm" option
The "diff-algorithm" option to the recursive merge strategy takes the name of the algorithm as an option, but it uses strcmp on the option string to check if it starts with "diff-algorithm=", meaning that this options cannot actually be used. Fix this by switching to prefixcmp. At the same time, clarify the following line by using strlen instead of a hard-coded length, which also makes it consistent with nearby code. Reported-by: Luke Noel-Storr <luke.noel-storr@integrate.co.uk> Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
John Keeping committed
Sep 26, 2013 at 21:02 UTC
6562928ae9ea46a3f2a7bd5a3dd500a7c149cc64
1 file changed
+2
-2
merge-recursive.c
+2
-2
@@ -2068,8 +2068,8 @@ int parse_merge_opt(struct merge_options *o, const char *s)
2068
o->xdl_opts = DIFF_WITH_ALG(o, PATIENCE_DIFF);
2069
else if (!strcmp(s, "histogram"))
2070
o->xdl_opts = DIFF_WITH_ALG(o, HISTOGRAM_DIFF);
2071
- else if (!strcmp(s, "diff-algorithm=")) {
2072
- long value = parse_algorithm_value(s+15);
2071
+ else if (!prefixcmp(s, "diff-algorithm=")) {
2072
+ long value = parse_algorithm_value(s + strlen("diff-algorithm="));
2073
if (value < 0)
2074
return -1;
2075
/* clear out previous settings */