diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-24 23:17:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-24 23:19:42 (GMT) |
| commit | e4d15959d45468bfb13c80195e3a6b40f5b0a489 (patch) | |
| tree | 847ff7ecdecbd5b4babe51cc57354a6b2d4f6091 /diff.c | |
| parent | 283c63fac2c76deda2058f03000e18fb35d44fb6 (diff) | |
| parent | 0895c6d4c09045a3faeb7b652a844fc81c774631 (diff) | |
| download | git-e4d15959d45468bfb13c80195e3a6b40f5b0a489.zip git-e4d15959d45468bfb13c80195e3a6b40f5b0a489.tar.gz git-e4d15959d45468bfb13c80195e3a6b40f5b0a489.tar.bz2 | |
Merge branch 'jk/diff-algo-finishing-touches' into maint
"git diff --diff-algorithm=algo" was understood by the command line
parser, but "git diff --diff-algorithm algo" was not.
* jk/diff-algo-finishing-touches:
diff: allow unstuck arguments with --diff-algorithm
git-merge(1): document diff-algorithm option to merge-recursive
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -3596,8 +3596,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac) options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF); else if (!strcmp(arg, "--histogram")) options->xdl_opts = DIFF_WITH_ALG(options, HISTOGRAM_DIFF); - else if (!prefixcmp(arg, "--diff-algorithm=")) { - long value = parse_algorithm_value(arg+17); + else if ((argcount = parse_long_opt("diff-algorithm", av, &optarg))) { + long value = parse_algorithm_value(optarg); if (value < 0) return error("option diff-algorithm accepts \"myers\", " "\"minimal\", \"patience\" and \"histogram\""); @@ -3605,6 +3605,7 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac) DIFF_XDL_CLR(options, NEED_MINIMAL); options->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK; options->xdl_opts |= value; + return argcount; } /* flags options */ |