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>

diff --git a/builtin/merge.c b/builtin/merge.c
index 9d5359edc2f72799e1bf517db5f26c5f29aff81f..1f7b69982b409b14e7c8322693a4f255dd820db2 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -14,6 +14,7 @@
 #include "lockfile.h"
 #include "run-command.h"
 #include "diff.h"
+#include "diff-merges.h"
 #include "refs.h"
 #include "refspec.h"
 #include "commit.h"
@@ -400,7 +401,7 @@ static void squash_message(struct commit *commit, struct commit_list *remotehead
        printf(_("Squash commit -- not updating HEAD\n"));
 
        repo_init_revisions(the_repository, &rev, NULL);
-       rev.ignore_merges = 1;
+       diff_merges_suppress(&rev);
        rev.commit_format = CMIT_FMT_MEDIUM;
 
        commit->object.flags |= UNINTERESTING;

diff --git a/diff-merges.c b/diff-merges.c
index 8325ab880166926f15785f5aa788143833c09e29..23e6cb11d1adc68ae881f3326028adc4c26a23cc 100644 (file)
--- a/diff-merges.c
+++ b/diff-merges.c
@@ -2,6 +2,14 @@
 
 #include "revision.h"
 
+static void suppress(struct rev_info *revs)
+{
+       revs->ignore_merges = 1;
+       revs->first_parent_merges = 0;
+       revs->combine_merges = 0;
+       revs->dense_combined_merges = 0;
+}
+
 /*
  * Public functions. They are in the order they are called.
  */
@@ -34,13 +42,13 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
                revs->dense_combined_merges = 1;
                revs->combine_merges = 1;
        } else if (!strcmp(arg, "--no-diff-merges")) {
-               revs->ignore_merges = 1;
+               suppress(revs);
        } else if (!strcmp(arg, "--combined-all-paths")) {
                revs->diff = 1;
                revs->combined_all_paths = 1;
        } else if ((argcount = parse_long_opt("diff-merges", argv, &optarg))) {
                if (!strcmp(optarg, "off")) {
-                       revs->ignore_merges = 1;
+                       suppress(revs);
                } else {
                        die(_("unknown value for --diff-merges: %s"), optarg);
                }
@@ -50,6 +58,11 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
        return argcount;
 }
 
+void diff_merges_suppress(struct rev_info *revs)
+{
+       suppress(revs);
+}
+
 void diff_merges_default_to_first_parent(struct rev_info *revs)
 {
        if (revs->ignore_merges < 0)            /* No -m */

diff --git a/diff-merges.h b/diff-merges.h
index 243ef915c4cd5acec594518b5158686592c7555b..a031240576f7967d83fcad0a9963b0605987be56 100644 (file)
--- a/diff-merges.h
+++ b/diff-merges.h
@@ -13,6 +13,8 @@ void diff_merges_init_revs(struct rev_info *revs);
 
 int diff_merges_parse_opts(struct rev_info *revs, const char **argv);
 
+void diff_merges_suppress(struct rev_info *revs);
+
 void diff_merges_default_to_first_parent(struct rev_info *revs);
 
 void diff_merges_default_to_dense_combined(struct rev_info *revs);

diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
index bd22e1ea8865c086dd5e0c7fa32229036c1d83f3..abc3403fb820152d994675c2e388f35b5d7e4bfa 100644 (file)
--- a/fmt-merge-msg.c
+++ b/fmt-merge-msg.c
@@ -2,6 +2,7 @@
 #include "refs.h"
 #include "object-store.h"
 #include "diff.h"
+#include "diff-merges.h"
 #include "revision.h"
 #include "tag.h"
 #include "string-list.h"
@@ -668,7 +669,7 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
                head = lookup_commit_or_die(&head_oid, "HEAD");
                repo_init_revisions(the_repository, &rev, NULL);
                rev.commit_format = CMIT_FMT_ONELINE;
-               rev.ignore_merges = 1;
+               diff_merges_suppress(&rev);
                rev.limited = 1;
 
                strbuf_complete_line(out);