diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-06-23 22:33:23 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-06-24 00:22:35 (GMT) |
| commit | 489947cee5095b168cbac111ff7bd1eadbbd90dd (patch) | |
| tree | ee24f367a7b5ded9fd17cdc4172d6c26cb3038fe /fmt-merge-msg.c | |
| parent | 0313f36c6ebecb3bffe6f15cf25a4883100f0214 (diff) | |
| download | git-489947cee5095b168cbac111ff7bd1eadbbd90dd.zip git-489947cee5095b168cbac111ff7bd1eadbbd90dd.tar.gz git-489947cee5095b168cbac111ff7bd1eadbbd90dd.tar.bz2 | |
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 <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fmt-merge-msg.c')
| -rw-r--r-- | fmt-merge-msg.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c index 72d32bd..cfb8ff2 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, |