diff options
| author |  John Keeping <john@keeping.me.uk> | 2013-04-05 13:19:14 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-04-05 11:01:08 -0700 |
| commit | 0895c6d4c09045a3faeb7b652a844fc81c774631 (patch) | |
| tree | eae4bd0294d46dee247c129c72b7f4cbae3c3aaf | |
| parent | git-merge(1): document diff-algorithm option to merge-recursive (diff) | |
| download | tgif-0895c6d4c09045a3faeb7b652a844fc81c774631.tar.xz | |
diff: allow unstuck arguments with --diff-algorithm
The argument to --diff-algorithm is mandatory, so there is no reason to
require the argument to be stuck to the option with '='. Change this
for consistency with other Git commands.
Note that this does not change the handling of diff-algorithm in
merge-recursive.c since the primary interface to that is via the -X
option to 'git merge' where the unstuck form does not make sense.
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | diff.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -3634,8 +3634,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\""); @@ -3643,6 +3643,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 */ |