From 489947cee5095b168cbac111ff7bd1eadbbd90dd Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 23 Jun 2020 22:33:23 +0000 Subject: fmt-merge-msg: stop treating `master` specially In the context of many projects renaming their primary branch names away from `master`, Git wants to stop treating the `master` branch specially. Let's start with `git fmt-merge-msg`. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- fmt-merge-msg.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'fmt-merge-msg.c') diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c index 72d32bd73b..cfb8ff2f33 100644 --- a/fmt-merge-msg.c +++ b/fmt-merge-msg.c @@ -451,10 +451,7 @@ static void fmt_merge_msg_title(struct strbuf *out, strbuf_addf(out, " of %s", srcs.items[i].string); } - if (!strcmp("master", current_branch)) - strbuf_addch(out, '\n'); - else - strbuf_addf(out, " into %s\n", current_branch); + strbuf_addf(out, " into %s\n", current_branch); } static void fmt_tag_signature(struct strbuf *tagbuf, -- cgit v1.2.3