Merge branch 'en/strmap'

[thirdparty/git.git] / fmt-merge-msg.c

diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
index bd22e1ea8865c086dd5e0c7fa32229036c1d83f3..9a664a4a5832daba2a69e1d91d996eddb1f8bb56 100644 (file)
--- a/fmt-merge-msg.c
+++ b/fmt-merge-msg.c
@@ -626,8 +626,10 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
        void *current_branch_to_free;
        struct merge_parents merge_parents;
 
-       if (!suppress_dest_pattern_seen)
+       if (!suppress_dest_pattern_seen) {
+               string_list_append(&suppress_dest_patterns, "main");
                string_list_append(&suppress_dest_patterns, "master");
+       }
 
        memset(&merge_parents, 0, sizeof(merge_parents));