From 4320815eb9a002b4ee64f70dda9b1c1e019f4894 Mon Sep 17 00:00:00 2001 From: Sergey Organov Date: Tue, 13 Apr 2021 14:41:14 +0300 Subject: 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 Signed-off-by: Junio C Hamano --- diff-merges.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'diff-merges.c') diff --git a/diff-merges.c b/diff-merges.c index 146bb50316..ff227368bd 100644 --- 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); -- cgit v1.2.3