Merge branch 'sb/config-write-fix'

diff --git a/builtin/range-diff.c b/builtin/range-diff.c
index f0598005aece52c84b7b18fdd432f9d205a3aac5..f52d45d9d614445e3473c810e9305c986a4dfdf8 100644 (file)
--- a/builtin/range-diff.c
+++ b/builtin/range-diff.c
@@ -20,9 +20,12 @@ int cmd_range_diff(int argc, const char **argv, const char *prefix)
 {
        int creation_factor = 60;
        struct diff_options diffopt = { NULL };
+       int simple_color = -1;
        struct option options[] = {
                OPT_INTEGER(0, "creation-factor", &creation_factor,
                            N_("Percentage by which creation is weighted")),
+               OPT_BOOL(0, "no-dual-color", &simple_color,
+                           N_("color both diff and diff-between-diffs")),
                OPT_END()
        };
        int i, j, res = 0;
@@ -33,6 +36,7 @@ int cmd_range_diff(int argc, const char **argv, const char *prefix)
 
        diff_setup(&diffopt);
        diffopt.output_format = DIFF_FORMAT_PATCH;
+       diffopt.flags.suppress_diff_headers = 1;
        diffopt.output_prefix = output_prefix_cb;
        strbuf_addstr(&four_spaces, "    ");
        diffopt.output_prefix_data = &four_spaces;
@@ -59,6 +63,13 @@ 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 (simple_color < 1) {
+               if (!simple_color)
+                       /* force color when --dual-color was used */
+                       diffopt.use_color = 1;
+               diffopt.flags.dual_color_diffed_diffs = 1;
+       }
+
        if (argc == 2) {
                if (!strstr(argv[0], ".."))
                        die(_("no .. in range: '%s'"), argv[0]);