From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH v3 0/2] fmt-merge-msg: selectively suppress "into <branch>"
Date: Thu, 30 Jul 2020 11:02:35 -0700 [thread overview]
Message-ID: <20200730180237.1392480-1-gitster@pobox.com> (raw)
In-Reply-To: <xmqq5za596uo.fsf@gitster.c.googlers.com>
So, this is the third iteration, which separates the reversion that
involves too many uninteresting test changes, and the implementation
of the new feature proper.
Two things that changed in the implementation since the previous
iterations are
- An assignment-less 'truth', i.e.
[merge] suppressDest
is now an error ("missing value for 'merge.suppressDest'"), not
"clear the list", which should be spelled as an empty string, i.e.
[merge] suppressDest = ""
- Scanning of dest_patterns to see if "into <branch>" is suppressed
for the current_branch is done in a helper function to make the
main codeflow easier to read, as suggested by Peff.
The previous iterations were
v1 <xmqqlfj27x7q.fsf@gitster.c.googlers.com>
v2 <xmqq5za596uo.fsf@gitster.c.googlers.com>
and can be found at https://lore.kernel.org/git/
Junio C Hamano (2):
Revert "fmt-merge-msg: stop treating `master` specially"
fmt-merge-msg: allow merge destination to be omitted again
Documentation/config/fmt-merge-msg.txt | 12 ++++
fmt-merge-msg.c | 35 ++++++++-
t/t1507-rev-parse-upstream.sh | 2 +-
t/t4013-diff-various.sh | 4 +-
t/t4013/diff.log_--decorate=full_--all | 2 +-
t/t4013/diff.log_--decorate_--all | 2 +-
...--patch-with-stat_--summary_master_--_dir_ | 2 +-
t/t4013/diff.log_--patch-with-stat_master | 2 +-
.../diff.log_--patch-with-stat_master_--_dir_ | 2 +-
...ot_--cc_--patch-with-stat_--summary_master | 2 +-
..._--root_--patch-with-stat_--summary_master | 2 +-
.../diff.log_--root_--patch-with-stat_master | 2 +-
...root_-c_--patch-with-stat_--summary_master | 2 +-
t/t4013/diff.log_--root_-p_master | 2 +-
t/t4013/diff.log_--root_master | 2 +-
t/t4013/diff.log_-m_-p_--first-parent_master | 2 +-
t/t4013/diff.log_-m_-p_master | 4 +-
t/t4013/diff.log_-p_--first-parent_master | 2 +-
t/t4013/diff.log_-p_master | 2 +-
t/t4013/diff.log_master | 2 +-
t/t4013/diff.show_--first-parent_master | 2 +-
t/t4013/diff.show_-c_master | 2 +-
t/t4013/diff.show_-m_master | 4 +-
t/t4013/diff.show_master | 2 +-
...ot_--cc_--patch-with-stat_--summary_master | 2 +-
...root_-c_--patch-with-stat_--summary_master | 2 +-
t/t4202-log.sh | 72 +++++++++----------
t/t6200-fmt-merge-msg.sh | 56 ++++++++++-----
t/t7600-merge.sh | 14 ++--
t/t7608-merge-messages.sh | 10 +--
30 files changed, 159 insertions(+), 94 deletions(-)
--
2.28.0
next prev parent reply other threads:[~2020-07-30 18:02 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
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 ` Junio C Hamano [this message]
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=20200730180237.1392480-1-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.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).