xdiff: add 'minimal' to XDF_DIFF_ALGORITHM_MASK

The XDF_DIFF_ALGORITHM_MASK bit mask only includes bits for the patience
and histogram diffs, not for the minimal one. This means that when
reseting the diff algorithm to the default one, one needs to separately
clear the bit for the minimal diff. There are places in the code that fail
to do that: merge-ort.c and builtin/merge-file.c.

Add the XDF_NEED_MINIMAL bit to the bit mask, and remove the separate
clearing of this bit in the places where it hasn't been forgotten.

Signed-off-by: Antonin Delpeuch <antonin@delpeuch.eu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/diff.c b/diff.c
index a74e701806be52d0f447c178e6c2c40dff36560c..f0a0cecc76b7c8c48dee06453f02978381856f83 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -3526,8 +3526,6 @@ static int set_diff_algorithm(struct diff_options *opts,
        if (value < 0)
                return -1;
 
-       /* clear out previous settings */
-       DIFF_XDL_CLR(opts, NEED_MINIMAL);
        opts->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
        opts->xdl_opts |= value;
 

diff --git a/merge-ort.c b/merge-ort.c
index 29858074f9d8bf8b8138b10f983957cd4cded16d..9b2b0fce7e20d5e5ddf067f9bf711d8952cadb3e 100644 (file)
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -5495,8 +5495,6 @@ int parse_merge_opt(struct merge_options *opt, const char *s)
                long value = parse_algorithm_value(arg);
                if (value < 0)
                        return -1;
-               /* clear out previous settings */
-               DIFF_XDL_CLR(opt, NEED_MINIMAL);
                opt->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
                opt->xdl_opts |= value;
        }

diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index 2cecde5afe5da1623a5ddb0e6affb7cea259b5c7..dc370712e9286098d4fbf487d183cc276e5a4462 100644 (file)
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@ -43,7 +43,7 @@ extern "C" {
 
 #define XDF_PATIENCE_DIFF (1 << 14)
 #define XDF_HISTOGRAM_DIFF (1 << 15)
-#define XDF_DIFF_ALGORITHM_MASK (XDF_PATIENCE_DIFF | XDF_HISTOGRAM_DIFF)
+#define XDF_DIFF_ALGORITHM_MASK (XDF_PATIENCE_DIFF | XDF_HISTOGRAM_DIFF | XDF_NEED_MINIMAL)
 #define XDF_DIFF_ALG(x) ((x) & XDF_DIFF_ALGORITHM_MASK)
 
 #define XDF_INDENT_HEURISTIC (1 << 23)