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>
Sergey Organov committed
Apr 13, 2021 at 14:41 UTC
4320815eb9a002b4ee64f70dda9b1c1e019f4894
2 files changed
+15
diff-merges.c
+7
@@ -2,6 +2,11 @@
2
3
#include "revision.h"
4
5
+typedef void (*diff_merges_setup_func_t)(struct rev_info *);
6
+static void set_separate(struct rev_info *revs);
7
+
8
+static diff_merges_setup_func_t set_to_default = set_separate;
9
+
10
static void suppress(struct rev_info *revs)
11
{
12
revs->separate_merges = 0;
@@ -66,6 +71,8 @@ static void set_diff_merges(struct rev_info *revs, const char *optarg)
71
set_combined(revs);
72
else if (!strcmp(optarg, "cc") || !strcmp(optarg, "dense-combined"))
73
set_dense_combined(revs);
74
+ else if (!strcmp(optarg, "on"))
75
+ set_to_default(revs);
76
else
77
die(_("unknown value for --diff-merges: %s"), optarg);
78
t/t4013-diff-various.sh
+8
@@ -452,6 +452,14 @@ diff-tree --stat --compact-summary initial mode
452
diff-tree -R --stat --compact-summary initial mode
453
EOF
454
455
+test_expect_success 'log --diff-merges=on matches --diff-merges=separate' '
456
+ git log -p --diff-merges=separate master >result &&
457
+ process_diffs result >expected &&
458
+ git log -p --diff-merges=on master >result &&
459
+ process_diffs result >actual &&
460
+ test_cmp expected actual
461
+'
462
+
463
test_expect_success 'log -S requires an argument' '
464
test_must_fail git log -S
465
'