reflog expire: cover reflog from all worktrees

diff --git a/builtin/range-diff.c b/builtin/range-diff.c
index 3b06ed9449a39168aa606994e6e2cf28fcd22fee..96af5374937e5b8b99343e8d324e54e98fb11743 100644 (file)
--- a/builtin/range-diff.c
+++ b/builtin/range-diff.c
@@ -13,11 +13,14 @@ NULL
 
 int cmd_range_diff(int argc, const char **argv, const char *prefix)
 {
-       int creation_factor = 60;
+       int creation_factor = RANGE_DIFF_CREATION_FACTOR_DEFAULT;
        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_("use simple diff colors")),
                OPT_END()
        };
        int i, j, res = 0;
@@ -26,7 +29,6 @@ int cmd_range_diff(int argc, const char **argv, const char *prefix)
        git_config(git_diff_ui_config, NULL);
 
        diff_setup(&diffopt);
-       diffopt.output_format = DIFF_FORMAT_PATCH;
 
        argc = parse_options(argc, argv, NULL, options,
                             builtin_range_diff_usage, PARSE_OPT_KEEP_UNKNOWN |
@@ -50,6 +52,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);
 
+       /* force color when --dual-color was used */
+       if (!simple_color)
+               diffopt.use_color = 1;
+
        if (argc == 2) {
                if (!strstr(argv[0], ".."))
                        die(_("no .. in range: '%s'"), argv[0]);
@@ -86,7 +92,7 @@ int cmd_range_diff(int argc, const char **argv, const char *prefix)
        }
 
        res = show_range_diff(range1.buf, range2.buf, creation_factor,
-                             &diffopt);
+                             simple_color < 1, &diffopt);
 
        strbuf_release(&range1);
        strbuf_release(&range2);