diff-merges: adapt -m to enable default diff format
Let -m option (and --diff-merges=m) enable the default format instead of "separate", to be able to tune it with log.diffMerges option. 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
38fc4dbbc2f110192752a3b2c99abb745f0494bf
1 file changed
+4
-4
diff-merges.c
+4
-4
@@ -34,10 +34,10 @@ static void set_m(struct rev_info *revs)
34
{
35
/*
36
* To "diff-index", "-m" means "match missing", and to the "log"
37
- * family of commands, it means "show full diff for merges". Set
37
+ * family of commands, it means "show default diff for merges". Set
38
* both fields appropriately.
39
*/
40
- set_separate(revs);
40
+ set_to_default(revs);
41
revs->match_missing = 1;
42
}
43
@@ -61,13 +61,13 @@ static diff_merges_setup_func_t func_by_opt(const char *optarg)
61
return suppress;
62
if (!strcmp(optarg, "1") || !strcmp(optarg, "first-parent"))
63
return set_first_parent;
64
- else if (!strcmp(optarg, "m") || !strcmp(optarg, "separate"))
64
+ else if (!strcmp(optarg, "separate"))
65
return set_separate;
66
else if (!strcmp(optarg, "c") || !strcmp(optarg, "combined"))
67
return set_combined;
68
else if (!strcmp(optarg, "cc") || !strcmp(optarg, "dense-combined"))
69
return set_dense_combined;
70
- else if (!strcmp(optarg, "on"))
70
+ else if (!strcmp(optarg, "m") || !strcmp(optarg, "on"))
71
return set_to_default;
72
return NULL;
73
}