diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-28 17:16:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-28 17:16:11 (GMT) |
| commit | b28325d3ab0172063d1fbe0e735d899ae43c6fee (patch) | |
| tree | 6bdda226074cf9062438565df4f4ffcd96d7d9a5 /merge-recursive.c | |
| parent | 3fa366668a2cfee9abfa62701b5176acb316f169 (diff) | |
| parent | 6562928ae9ea46a3f2a7bd5a3dd500a7c149cc64 (diff) | |
| download | git-b28325d3ab0172063d1fbe0e735d899ae43c6fee.zip git-b28325d3ab0172063d1fbe0e735d899ae43c6fee.tar.gz git-b28325d3ab0172063d1fbe0e735d899ae43c6fee.tar.bz2 | |
Merge branch 'jk/diff-algo' into maint
"git merge-recursive" did not parse its "--diff-algorithm=" command
line option correctly.
* jk/diff-algo:
merge-recursive: fix parsing of "diff-algorithm" option
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index f95933b..fc2f001 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -2069,8 +2069,8 @@ int parse_merge_opt(struct merge_options *o, const char *s) o->xdl_opts = DIFF_WITH_ALG(o, PATIENCE_DIFF); else if (!strcmp(s, "histogram")) o->xdl_opts = DIFF_WITH_ALG(o, HISTOGRAM_DIFF); - else if (!strcmp(s, "diff-algorithm=")) { - long value = parse_algorithm_value(s+15); + else if (!prefixcmp(s, "diff-algorithm=")) { + long value = parse_algorithm_value(s + strlen("diff-algorithm=")); if (value < 0) return -1; /* clear out previous settings */ |