From: Johannes Sixt Date: Wed, 17 Jun 2020 20:56:18 GMT Subject: Re: [PATCH v2 02/12] fmt-merge-msg: introduce a way to override the main branch name Message-ID: <1612660e-aa49-5d7f-d47e-34740e330eaa@kdbg.org> In-Reply-To: Am 15.06.20 um 14:50 schrieb Johannes Schindelin via GitGitGadget: > @@ -451,10 +451,12 @@ static void fmt_merge_msg_title(struct strbuf *out, > strbuf_addf(out, " of %s", srcs.items[i].string); > } > > - if (!strcmp("master", current_branch)) > + main_branch = git_main_branch_name(); > + if (!strcmp(main_branch, current_branch)) > strbuf_addch(out, '\n'); > else > strbuf_addf(out, " into %s\n", current_branch); > + free(main_branch); > } Now that the removal of this special case is on the plate, I would prefer that the phrase "into foo" is never appended instead of always appended. For me, it was a always more of a hindrance than a help. The story goes like this: A branch that I'm working on was named "edit-box-fix" yesterday, but today it was renamed to "layout-fix" because the scope changed. I had merged a topic "rename-buttons" yesterday, and now I have to go back and rename that "into edit-box-fix" thing! Argh! And tomorrow I'm going to branch off yet another feature "optional-reset" from today's state that will be merged into upstream soon; "Merge branch 'rename-buttons' into layout-fix" will read strange in a history that ends in "Merge branch 'optional-reset'". And I haven't even mentioned this horrid "into HEAD", which you get during a rebase operation. To be clear, the branch name in "Merge branch 'option-reset'" is very important and invaluable. But the "into foo" part is mostly noise. -- Hannes