conditional markdown preprocessing

diff --git a/builtin/range-diff.c b/builtin/range-diff.c
index 94c1f362cc4feec11c2ab622f9399c1dff7e2840..9202e75544761f274d3e360a3dc609fff294d0bb 100644 (file)
--- a/builtin/range-diff.c
+++ b/builtin/range-diff.c
@@ -2,6 +2,7 @@
 #include "builtin.h"
 #include "parse-options.h"
 #include "range-diff.h"
+#include "config.h"
 
 static const char * const builtin_range_diff_usage[] = {
 N_("git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"),
@@ -12,18 +13,34 @@ NULL
 
 int cmd_range_diff(int argc, const char **argv, const char *prefix)
 {
-       int creation_factor = 60;
-       struct option options[] = {
+       int creation_factor = RANGE_DIFF_CREATION_FACTOR_DEFAULT;
+       struct diff_options diffopt = { NULL };
+       int simple_color = -1;
+       struct option range_diff_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()
        };
+       struct option *options;
        int res = 0;
        struct strbuf range1 = STRBUF_INIT, range2 = STRBUF_INIT;
 
-       argc = parse_options(argc, argv, NULL, options,
+       git_config(git_diff_ui_config, NULL);
+
+       repo_diff_setup(the_repository, &diffopt);
+
+       options = parse_options_concat(range_diff_options, diffopt.parseopts);
+       argc = parse_options(argc, argv, prefix, options,
                             builtin_range_diff_usage, 0);
 
+       diff_setup_done(&diffopt);
+
+       /* 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]);
@@ -58,8 +75,10 @@ int cmd_range_diff(int argc, const char **argv, const char *prefix)
                error(_("need two commit ranges"));
                usage_with_options(builtin_range_diff_usage, options);
        }
+       FREE_AND_NULL(options);
 
-       res = show_range_diff(range1.buf, range2.buf, creation_factor);
+       res = show_range_diff(range1.buf, range2.buf, creation_factor,
+                             simple_color < 1, &diffopt);
 
        strbuf_release(&range1);
        strbuf_release(&range2);