From: Ariadne Conill <ariadne@dereferenced.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH v4 0/3] use mailmap by default in git log
Date: Fri, 12 Jul 2019 03:40:13 -0500 [thread overview]
Message-ID: <CAAOiGNwGqtSoG8vsy+3gb0=tDVvA1YcA3FcDP0KQMa0=xp5j9w@mail.gmail.com> (raw)
In-Reply-To: <xmqqtvbsqs9x.fsf@gitster-ct.c.googlers.com>
Hello,
On Thu, Jul 11, 2019 at 2:34 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> Junio C Hamano <gitster@pobox.com> writes:
>
> > Even though I personally think it is an OK longer-term end goal, the
> > execution looks too hasty. The normal way we handle a big behaviour
> > change like this is to do the following in steps, in different
> > releases:
> >
> > - In the first release, introduce an early adoptor option (say
> > log.usemailmap) that can be turned on by the user, but is off by
> > default. IOW, the initial step is "no change in behaviour,
> > unless you ask for it". This step also makes sure that the way
> > to disable it for those who opt into the option from the command
> > line (i.e. the --no-use-mailmap option) works well.
> >
> > - In the second release, when "git log" is run without command line
> > "--[no-]use-mailmap" and "log.usemailmap" is not set by the user,
> > give warning about an upcoming flipping of the default, with an
> > advice message that the user can squelch the warning by setting
> > the option.
> >
> > - In the final release, flip the default and remove the warning.
> >
> > Usually there needs sufficient time between the second step and the
> > third step, so that people will not miss the warning.
>
> IIUC, we are between step 1 and step 2. The configuration already
> exists and uses the safe (i.e. the same as before) default. Your
> change combines the step 2 and step 3 into one, which will not work.
Makes sense.
> What we need at this point is the "second release" phase, i.e.
> additional warnings without yet changing the default behaviour.
> After it is given to the end users and sufficient time passes, we
> can flip the default.
Do you have a proposed timetable for this? I can add a warning
message and we can proceed with the warning message for now and then
flip the defaults later. I just need to know what version you would
like to do the flip in (3.0?) so that I can write the warning message.
Assuming the release you would like to flip the setting in is 3.0, I
would propose something like this:
Warning: The `git log` command will default to using the mailmap file
if present to map contributor names as of Git 3.0. If you want to
enable this behaviour now, use `git config --global log.mailmap true`
to enable it. If you want to explicitly disable this behaviour in the
future, use `git config --global log.mailmap false` to disable it.
Your thoughts on this message?
Ariadne
next prev parent reply other threads:[~2019-07-12 8:40 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-11 18:37 [PATCH v4 0/3] use mailmap by default in git log Ariadne Conill
2019-07-11 18:37 ` [PATCH v4 1/3] log: use mailmap by default Ariadne Conill
2019-07-11 18:37 ` [PATCH v4 2/3] log: document --no-use-mailmap option Ariadne Conill
2019-07-11 18:37 ` [PATCH v4 3/3] tests: rework mailmap tests for git log Ariadne Conill
2019-07-11 19:32 ` Martin Ågren
2019-07-11 19:30 ` [PATCH v4 0/3] use mailmap by default in " Junio C Hamano
2019-07-11 19:34 ` Junio C Hamano
2019-07-12 8:40 ` Ariadne Conill [this message]
2019-07-12 14:17 ` Junio C Hamano
2019-07-12 14:49 ` Junio C Hamano
2019-07-12 16:17 ` Ariadne Conill
2019-09-22 21:00 ` CB Bailey
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='CAAOiGNwGqtSoG8vsy+3gb0=tDVvA1YcA3FcDP0KQMa0=xp5j9w@mail.gmail.com' \
--to=ariadne@dereferenced.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).