mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-09 16:06:10 +02:00
Code

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>
This commit is contained in:
Johannes Schindelin 2020-10-23 13:59:58 +00:00 committed by Junio C Hamano
parent 69986e19ff
commit 2217230d53
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fmt-merge-msg.c
View File

@ -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));