diff-merges: introduce --diff-merges=on

Introduce the notion of default diff format for merges, and the option
"on" to select it. The default format is "separate" and can't yet
be changed, so effectively "on" is just a synonym for "separate"
for now. Add corresponding test to t4013.

This is in preparation for introducing log.diffMerges configuration
option that will let --diff-merges=on to be configured to any
supported format.

Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/diff-merges.c b/diff-merges.c
index 146bb50316a6808e381610dc7168a3b7cf638275..ff227368bd46f185c153e74d8343eb575568018e 100644 (file)
--- a/diff-merges.c
+++ b/diff-merges.c
@@ -2,6 +2,11 @@
 
 #include "revision.h"
 
+typedef void (*diff_merges_setup_func_t)(struct rev_info *);
+static void set_separate(struct rev_info *revs);
+
+static diff_merges_setup_func_t set_to_default = set_separate;
+
 static void suppress(struct rev_info *revs)
 {
        revs->separate_merges = 0;
@@ -66,6 +71,8 @@ static void set_diff_merges(struct rev_info *revs, const char *optarg)
                set_combined(revs);
        else if (!strcmp(optarg, "cc") || !strcmp(optarg, "dense-combined"))
                set_dense_combined(revs);
+       else if (!strcmp(optarg, "on"))
+               set_to_default(revs);
        else
                die(_("unknown value for --diff-merges: %s"), optarg);
 

diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 6cca8b84a6bf3f2098d47ab56bb9f8da0293dff5..26a7b4d19d4de72036c57fc1f8e6b879e2816d12 100755 (executable)
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -452,6 +452,14 @@ diff-tree --stat --compact-summary initial mode
 diff-tree -R --stat --compact-summary initial mode
 EOF
 
+test_expect_success 'log --diff-merges=on matches --diff-merges=separate' '
+       git log -p --diff-merges=separate master >result &&
+       process_diffs result >expected &&
+       git log -p --diff-merges=on master >result &&
+       process_diffs result >actual &&
+       test_cmp expected actual
+'
+
 test_expect_success 'log -S requires an argument' '
        test_must_fail git log -S
 '