Merge branch 'es/format-patch-interdiff' into es/format-patch-rangediff

diff --git a/builtin/range-diff.c b/builtin/range-diff.c
index 5a9ad82fb888308d239cc636d4991ce5ee82a51f..f52d45d9d614445e3473c810e9305c986a4dfdf8 100644 (file)
--- a/builtin/range-diff.c
+++ b/builtin/range-diff.c
@@ -20,11 +20,11 @@ int cmd_range_diff(int argc, const char **argv, const char *prefix)
 {
        int creation_factor = 60;
        struct diff_options diffopt = { NULL };
-       int dual_color = 0;
+       int simple_color = -1;
        struct option options[] = {
                OPT_INTEGER(0, "creation-factor", &creation_factor,
                            N_("Percentage by which creation is weighted")),
-               OPT_BOOL(0, "dual-color", &dual_color,
+               OPT_BOOL(0, "no-dual-color", &simple_color,
                            N_("color both diff and diff-between-diffs")),
                OPT_END()
        };
@@ -63,8 +63,10 @@ int cmd_range_diff(int argc, const char **argv, const char *prefix)
                             options + ARRAY_SIZE(options) - 1, /* OPT_END */
                             builtin_range_diff_usage, 0);
 
-       if (dual_color) {
-               diffopt.use_color = 1;
+       if (simple_color < 1) {
+               if (!simple_color)
+                       /* force color when --dual-color was used */
+                       diffopt.use_color = 1;
                diffopt.flags.dual_color_diffed_diffs = 1;
        }