Re: [PATCH] diff: resurrect XDF_NEED_MINIMAL with --minimal
From: Tay Ray Chuan <hidden>
Date: 2016-06-15 22:52:09
On Mon, Oct 3, 2011 at 8:38 PM, Jonathan Nieder [off-list ref] wrote: Thanks for the Cc, Johnathan.
Junio C Hamano wrote:quoted
* This together with René's c5aa906 (Revert removal of multi-match discard heuristic in 27af01, 2011-09-25) on top of v1.7.7 seems to give identical diff output as v1.7.1 (e.g. "git diff-tree -p v2.6.39 v3.0" in the kernel repository, with "--minimal").Very neat.
Interesting. Clearly there is more than just the multi-match discard heuristic in (xdl_clean_mmatch() and xdl_cleanup_records()).
quoted hunk ↗ jump to hunk
diff --git i/diff.c w/diff.c index fcc00780..2282f86f 100644 --- i/diff.c +++ w/diff.c@@ -3393,6 +3393,10 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)DIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL); else if (!strcmp(arg, "--patience")) DIFF_XDL_SET(options, PATIENCE_DIFF); + else if (!strcmp(arg, "--minimal")) + DIFF_XDL_SET(options, NEED_MINIMAL); + else if (!strcmp(arg, "--no-minimal")) + DIFF_XDL_CLR(options, NEED_MINIMAL); else if (!strcmp(arg, "--histogram")) DIFF_XDL_SET(options, HISTOGRAM_DIFF);
That's an improvement, but it would be even better if it was placed above the --<strategy> options, instead of being placed between them. -- Cheers, Ray Chuan