From: Junio C Hamano <gitster@pobox.com> To: Jeff King <peff@peff.net> Cc: Jonathan Nieder <jrnieder@gmail.com>, Johannes Schindelin <Johannes.Schindelin@gmx.de>, git-for-windows@googlegroups.com, git@vger.kernel.org, git-packagers@googlegroups.com, Ariadne Conill <ariadne@dereferenced.org> Subject: Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0 Date: Thu, 01 Aug 2019 14:54:58 -0700 Message-ID: <xmqq5zngmtzh.fsf@gitster-ct.c.googlers.com> (raw) In-Reply-To: <xmqqa7csmudm.fsf@gitster-ct.c.googlers.com> (Junio C. Hamano's message of "Thu, 01 Aug 2019 14:46:29 -0700") Junio C Hamano <gitster@pobox.com> writes: > Jeff King <peff@peff.net> writes: > >>> + if (mailmap < 0) >>> mailmap = 0; >>> - } >> >> This should be "mailmap = 1" to match the commit message, no? (Which >> also implies we may want a new test). > > Gaa, of course. -- >8 -- From: Junio C Hamano <gitster@pobox.com> Date: Thu, 1 Aug 2019 14:48:34 -0700 Subject: [PATCH] log: really flip the --mailmap default Signed-off-by: Junio C Hamano <gitster@pobox.com> --- builtin/log.c | 2 +- t/t4203-mailmap.sh | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/builtin/log.c b/builtin/log.c index 40b4cbf57d..02fa179077 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -205,7 +205,7 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix, userformat_find_requirements(NULL, &w); if (mailmap < 0) - mailmap = 0; + mailmap = 1; if (!rev->show_notes_given && (!rev->pretty_given || w.notes)) rev->show_notes = 1; diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh index 43b1522ea2..ede0c292af 100755 --- a/t/t4203-mailmap.sh +++ b/t/t4203-mailmap.sh @@ -461,6 +461,11 @@ test_expect_success 'Grep author with log.mailmap' ' test_cmp expect actual ' +test_expect_success 'log.mailmap is true by default these days' ' + git log --author Santa | grep Author >actual && + test_cmp expect actual +' + test_expect_success 'Only grep replaced author with --use-mailmap' ' git log --use-mailmap --author "<cto@coompany.xx>" >actual && test_must_be_empty actual -- 2.23.0-rc0-155-g5fbf3435fe
next prev parent reply other threads:[~2019-08-01 21:55 UTC|newest] Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-29 21:49 Junio C Hamano 2019-07-31 12:43 ` Git for Windows v2.23.0-rc0, was " Johannes Schindelin 2019-07-31 23:18 ` Jeff King 2019-08-01 0:21 ` Jonathan Nieder 2019-08-01 0:37 ` Ariadne Conill 2019-08-01 1:00 ` Jeff King 2019-08-01 1:14 ` Jonathan Nieder 2019-08-01 1:38 ` Ariadne Conill 2019-08-01 2:53 ` Jeff King 2019-08-01 3:21 ` Junio C Hamano 2019-08-01 4:54 ` Ariadne Conill 2019-08-01 21:39 ` Johannes Schindelin 2019-08-01 15:45 ` Junio C Hamano 2019-08-01 16:12 ` Ariadne Conill 2019-08-01 21:36 ` Jeff King 2019-08-01 21:46 ` Junio C Hamano 2019-08-01 21:54 ` Junio C Hamano [this message] 2019-08-01 22:18 ` Todd Zullinger 2019-08-02 2:27 ` Jonathan Nieder 2019-08-02 16:53 ` Junio C Hamano 2019-08-02 18:35 ` Jeff King 2019-08-01 1:04 ` [git-for-windows] " Bryan Turner 2019-08-01 21:40 ` Johannes Schindelin 2019-08-01 14:12 ` [PATCH] RelNotes/2.23.0: fix a few typos and other minor issues Martin Ågren 2019-08-01 15:56 ` Junio C Hamano 2019-08-01 15:57 ` Junio C Hamano 2019-08-01 19:28 ` Martin Ågren
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=xmqq5zngmtzh.fsf@gitster-ct.c.googlers.com \ --to=gitster@pobox.com \ --cc=Johannes.Schindelin@gmx.de \ --cc=ariadne@dereferenced.org \ --cc=git-for-windows@googlegroups.com \ --cc=git-packagers@googlegroups.com \ --cc=git@vger.kernel.org \ --cc=jrnieder@gmail.com \ --cc=peff@peff.net \ /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
git@vger.kernel.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ https://public-inbox.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git