diff-merges: new function diff_merges_suppress()
This function sets all the relevant flags to disabled state, so that no code that checks only one of them get it wrong. Then we call this new function everywhere where diff merges output suppression is needed. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sergey Organov committed
Dec 21, 2020 at 18:19 UTC
09322b1da92fd32204c8b4b07cf12decccfe47f3
4 files changed
+21
-4
builtin/merge.c
+2
-1
@@ -14,6 +14,7 @@
14
#include "lockfile.h"
15
#include "run-command.h"
16
#include "diff.h"
17
+#include "diff-merges.h"
18
#include "refs.h"
19
#include "refspec.h"
20
#include "commit.h"
@@ -400,7 +401,7 @@ static void squash_message(struct commit *commit, struct commit_list *remotehead
401
printf(_("Squash commit -- not updating HEAD\n"));
402
403
repo_init_revisions(the_repository, &rev, NULL);
403
- rev.ignore_merges = 1;
404
+ diff_merges_suppress(&rev);
405
rev.commit_format = CMIT_FMT_MEDIUM;
406
407
commit->object.flags |= UNINTERESTING;
diff-merges.c
+15
-2
@@ -2,6 +2,14 @@
2
3
#include "revision.h"
4
5
+static void suppress(struct rev_info *revs)
6
+{
7
+ revs->ignore_merges = 1;
8
+ revs->first_parent_merges = 0;
9
+ revs->combine_merges = 0;
10
+ revs->dense_combined_merges = 0;
11
+}
12
+
13
/*
14
* Public functions. They are in the order they are called.
15
*/
@@ -34,13 +42,13 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
42
revs->dense_combined_merges = 1;
43
revs->combine_merges = 1;
44
} else if (!strcmp(arg, "--no-diff-merges")) {
37
- revs->ignore_merges = 1;
45
+ suppress(revs);
46
} else if (!strcmp(arg, "--combined-all-paths")) {
47
revs->diff = 1;
48
revs->combined_all_paths = 1;
49
} else if ((argcount = parse_long_opt("diff-merges", argv, &optarg))) {
50
if (!strcmp(optarg, "off")) {
43
- revs->ignore_merges = 1;
51
+ suppress(revs);
52
} else {
53
die(_("unknown value for --diff-merges: %s"), optarg);
54
}
@@ -50,6 +58,11 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
58
return argcount;
59
}
60
61
+void diff_merges_suppress(struct rev_info *revs)
62
+{
63
+ suppress(revs);
64
+}
65
+
66
void diff_merges_default_to_first_parent(struct rev_info *revs)
67
{
68
if (revs->ignore_merges < 0) /* No -m */
diff-merges.h
+2
@@ -13,6 +13,8 @@ void diff_merges_init_revs(struct rev_info *revs);
13
14
int diff_merges_parse_opts(struct rev_info *revs, const char **argv);
15
16
+void diff_merges_suppress(struct rev_info *revs);
17
+
18
void diff_merges_default_to_first_parent(struct rev_info *revs);
19
20
void diff_merges_default_to_dense_combined(struct rev_info *revs);
fmt-merge-msg.c
+2
-1
@@ -2,6 +2,7 @@
2
#include "refs.h"
3
#include "object-store.h"
4
#include "diff.h"
5
+#include "diff-merges.h"
6
#include "revision.h"
7
#include "tag.h"
8
#include "string-list.h"
@@ -668,7 +669,7 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
669
head = lookup_commit_or_die(&head_oid, "HEAD");
670
repo_init_revisions(the_repository, &rev, NULL);
671
rev.commit_format = CMIT_FMT_ONELINE;
671
- rev.ignore_merges = 1;
672
+ diff_merges_suppress(&rev);
673
rev.limited = 1;
674
675
strbuf_complete_line(out);