From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH 01/10] fmt-merge-msg: also suppress "into main" by default
Date: Mon, 19 Oct 2020 19:31:32 +0000 [thread overview]
Message-ID: <cf950c6f6a48f9a6ad55ac027afbc0640f9a535d.1603135902.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.758.git.1603135902.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
In preparation for changing the default branch name to `main`, let's
skip the suffix "into main" in merge commit messages.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
fmt-merge-msg.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
index bd22e1ea88..9a664a4a58 100644
--- a/fmt-merge-msg.c
+++ b/fmt-merge-msg.c
@@ -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));
--
gitgitgadget
next prev parent reply other threads:[~2020-10-19 19:31 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-19 19:31 [PATCH 00/10] Prepare for changing the default branch name main (last manual part) Johannes Schindelin via GitGitGadget
2020-10-19 19:31 ` Johannes Schindelin via GitGitGadget [this message]
2020-10-21 22:12 ` [PATCH 01/10] fmt-merge-msg: also suppress "into main" by default Junio C Hamano
2020-10-22 12:28 ` Johannes Schindelin
2020-10-19 19:31 ` [PATCH 02/10] t9801: use `--` in preparation for default branch rename Johannes Schindelin via GitGitGadget
2020-10-21 22:19 ` Junio C Hamano
2020-10-19 19:31 ` [PATCH 03/10] tests: start moving to a different default main branch name Johannes Schindelin via GitGitGadget
2020-10-21 22:22 ` Junio C Hamano
2020-10-19 19:31 ` [PATCH 04/10] t4013: prepare for the new default branch name "main" Johannes Schindelin via GitGitGadget
2020-10-21 22:23 ` Junio C Hamano
2020-10-22 12:27 ` Johannes Schindelin
2020-10-19 19:31 ` [PATCH 05/10] t6200: adjust suppression pattern to also match "main" Johannes Schindelin via GitGitGadget
2020-10-21 22:27 ` Junio C Hamano
2020-10-22 13:01 ` Johannes Schindelin
2020-10-19 19:31 ` [PATCH 06/10] t5703: adjust a test case for the upcoming default branch name Johannes Schindelin via GitGitGadget
2020-10-21 22:34 ` Junio C Hamano
2020-10-19 19:31 ` [PATCH 07/10] t3200: prepare for `main` being shorter than `master` Johannes Schindelin via GitGitGadget
2020-10-21 22:39 ` Junio C Hamano
2020-10-22 13:08 ` Johannes Schindelin
2020-10-19 19:31 ` [PATCH 08/10] t9902: prepare a test for the upcoming default branch name Johannes Schindelin via GitGitGadget
2020-10-19 19:31 ` [PATCH 09/10] tests: prepare aligned mentions of the " Johannes Schindelin via GitGitGadget
2020-10-19 19:31 ` [PATCH 10/10] t1400: prepare for `main` being " Johannes Schindelin via GitGitGadget
2020-10-21 21:59 ` [PATCH 00/10] Prepare for changing the default branch name main (last manual part) Junio C Hamano
2020-10-22 13:11 ` Johannes Schindelin
2020-10-23 13:59 ` [PATCH v2 0/9] " Johannes Schindelin via GitGitGadget
2020-10-23 13:59 ` [PATCH v2 1/9] fmt-merge-msg: also suppress "into main" by default Johannes Schindelin via GitGitGadget
2020-10-23 13:59 ` [PATCH v2 2/9] t9801: use `--` in preparation for default branch rename Johannes Schindelin via GitGitGadget
2020-10-23 14:00 ` [PATCH v2 3/9] tests: start moving to a different default main branch name Johannes Schindelin via GitGitGadget
2020-10-23 14:00 ` [PATCH v2 4/9] t6200: adjust suppression pattern to also match "main" Johannes Schindelin via GitGitGadget
2020-10-23 14:00 ` [PATCH v2 5/9] t5703: adjust a test case for the upcoming default branch name Johannes Schindelin via GitGitGadget
2020-10-23 14:00 ` [PATCH v2 6/9] t3200: prepare for `main` being shorter than `master` Johannes Schindelin via GitGitGadget
2020-10-23 14:00 ` [PATCH v2 7/9] t9902: prepare a test for the upcoming default branch name Johannes Schindelin via GitGitGadget
2020-10-23 14:00 ` [PATCH v2 8/9] tests: prepare aligned mentions of the " Johannes Schindelin via GitGitGadget
2020-10-23 14:00 ` [PATCH v2 9/9] t1400: prepare for `main` being " Johannes Schindelin via GitGitGadget
2020-10-23 15:59 ` [PATCH v2 0/9] Prepare for changing the default branch name main (last manual part) Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cf950c6f6a48f9a6ad55ac027afbc0640f9a535d.1603135902.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).