From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Git List Mailing <git@vger.kernel.org>
Subject: Re: Avoiding 'master' nomenclature
Date: Wed, 29 Jul 2020 15:50:01 -0700 [thread overview]
Message-ID: <xmqqlfj27x7q.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <xmqqv9i6814y.fsf@gitster.c.googlers.com> (Junio C. Hamano's message of "Wed, 29 Jul 2020 14:25:17 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> The fast-export side lifted the "single branch is special"; we
> didn't do something similar for "fmt-merge-msg".
>
>> So I think a path forward is more like:
>>
>> 1. Add a new config option to shorten fmt-merge-msg's output when the
>> destination branch matches it (and this should perhaps not even be
>> a single name, but a set of globs, which supports more workflows).
>> Call it merge.suppressDest or something.
>>
>> 2. Optionally a repository created with "git init" could copy its
>> init.defaultBranch into merge.suppressDest. And likewise a clone
>> might copy the remote HEAD into that variable. I'm not sure if that
>> is worth doing or not, but it would restore the original behavior
>> for the most part.
>
> Yeah, that sounds like a good plan.
A rough outline I did while waiting for today's integration builds
to finish looks like this, which does not look _too_ bad. We can
replace the literal 'master' with the default branch name determined
at runtime, but I am not sure if that is needed.
fmt-merge-msg.c | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
index cfb8ff2f33..b99699eacc 100644
--- a/fmt-merge-msg.c
+++ b/fmt-merge-msg.c
@@ -10,6 +10,8 @@
#include "commit-reach.h"
static int use_branch_desc;
+static int suppress_dest_pattern_seen;
+static struct string_list suppress_dest_patterns = STRING_LIST_INIT_DUP;
int fmt_merge_msg_config(const char *key, const char *value, void *cb)
{
@@ -22,6 +24,12 @@ int fmt_merge_msg_config(const char *key, const char *value, void *cb)
merge_log_config = DEFAULT_MERGE_LOG_LEN;
} else if (!strcmp(key, "merge.branchdesc")) {
use_branch_desc = git_config_bool(key, value);
+ } else if (!strcmp(key, "merge.suppressdest")) {
+ if (!value)
+ string_list_clear(&suppress_dest_patterns, 0);
+ else
+ string_list_append(&suppress_dest_patterns, value);
+ suppress_dest_pattern_seen = 1;
} else {
return git_default_config(key, value, cb);
}
@@ -408,6 +416,8 @@ static void fmt_merge_msg_title(struct strbuf *out,
{
int i = 0;
char *sep = "";
+ struct string_list_item *item;
+ int suppress_merge_dest = 0;
strbuf_addstr(out, "Merge ");
for (i = 0; i < srcs.nr; i++) {
@@ -451,7 +461,15 @@ static void fmt_merge_msg_title(struct strbuf *out,
strbuf_addf(out, " of %s", srcs.items[i].string);
}
- strbuf_addf(out, " into %s\n", current_branch);
+ for_each_string_list_item(item, &suppress_dest_patterns) {
+ if (!wildmatch(item->string, current_branch, WM_PATHNAME)) {
+ suppress_merge_dest = 1;
+ break;
+ }
+ }
+
+ if (!suppress_merge_dest)
+ strbuf_addf(out, " into %s\n", current_branch);
}
static void fmt_tag_signature(struct strbuf *tagbuf,
@@ -596,6 +614,9 @@ 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)
+ string_list_append(&suppress_dest_patterns, "master");
+
memset(&merge_parents, 0, sizeof(merge_parents));
/* get current branch */
next prev parent reply other threads:[~2020-07-29 22:50 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-29 19:44 Avoiding 'master' nomenclature Linus Torvalds
2020-07-29 20:04 ` Junio C Hamano
2020-07-29 20:23 ` Linus Torvalds
2020-07-29 20:38 ` Jonathan Nieder
2020-07-29 20:46 ` Linus Torvalds
2020-07-29 20:56 ` Linus Torvalds
2020-07-30 8:17 ` lego_12239
2020-07-31 0:57 ` Jeff King
2020-07-31 8:19 ` Oleg
2020-07-29 20:40 ` Linus Torvalds
2020-07-29 20:58 ` Jeff King
2020-07-29 21:20 ` Linus Torvalds
2020-07-30 0:29 ` Jeff King
2020-07-30 0:44 ` Linus Torvalds
2020-07-30 0:52 ` Jeff King
2020-07-30 0:57 ` Linus Torvalds
2020-07-31 0:44 ` Jeff King
2020-07-29 21:25 ` Junio C Hamano
2020-07-29 22:50 ` Junio C Hamano [this message]
2020-07-30 0:14 ` Jeff King
2020-07-30 0:23 ` Linus Torvalds
2020-07-30 10:11 ` Michal Suchánek
2020-07-30 0:31 ` Jeff King
2020-07-30 0:36 ` Junio C Hamano
2020-07-30 18:02 ` [PATCH v3 0/2] fmt-merge-msg: selectively suppress "into <branch>" Junio C Hamano
2020-07-30 18:02 ` [PATCH v3 1/2] Revert "fmt-merge-msg: stop treating `master` specially" Junio C Hamano
2020-07-30 19:10 ` Eric Sunshine
2020-07-30 19:40 ` Junio C Hamano
2020-07-30 18:02 ` [PATCH v3 2/2] fmt-merge-msg: allow merge destination to be omitted again Junio C Hamano
2020-07-31 0:42 ` [PATCH v3 0/2] fmt-merge-msg: selectively suppress "into <branch>" Jeff King
2020-07-31 2:04 ` Junio C Hamano
2020-07-31 2:22 ` Jeff King
2020-07-31 20:03 ` Taylor Blau
2020-07-31 20:12 ` Junio C Hamano
2020-07-31 20:17 ` Taylor Blau
2020-08-01 7:15 ` Michal Suchánek
2020-08-10 11:53 ` Avoiding 'master' nomenclature Johannes Schindelin
2020-08-10 15:45 ` Junio C Hamano
2020-08-11 2:39 ` Johannes Schindelin
2020-08-12 0:30 ` Junio C Hamano
2020-07-29 20:40 ` Junio C Hamano
2020-07-29 20:51 ` Linus Torvalds
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqlfj27x7q.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=torvalds@linux-foundation.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).