fmt-merge-msg: also suppress "into main" by default
In preparation for changing the default branch name to `main`, let's skip the suffix "into main" in merge commit messages, the same way that "into master" has been skipped by default. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Oct 23, 2020 at 13:59 UTC
2217230d53ab6d3c6b61fc996a8394cbf8c7fce9
1 file changed
+3
-1
fmt-merge-msg.c
+3
-1
@@ -626,8 +626,10 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
626
void *current_branch_to_free;
627
struct merge_parents merge_parents;
628
629
- if (!suppress_dest_pattern_seen)
629
+ if (!suppress_dest_pattern_seen) {
630
+ string_list_append(&suppress_dest_patterns, "main");
631
string_list_append(&suppress_dest_patterns, "master");
632
+ }
633
634
memset(&merge_parents, 0, sizeof(merge_parents));
635