git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Ariadne Conill <ariadne@dereferenced.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v4 0/3] use mailmap by default in git log
Date: Thu, 11 Jul 2019 12:30:46 -0700	[thread overview]
Message-ID: <xmqqy314qsgp.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20190711183727.8058-1-ariadne@dereferenced.org> (Ariadne Conill's message of "Thu, 11 Jul 2019 13:37:24 -0500")

Ariadne Conill <ariadne@dereferenced.org> writes:

> It is not uncommon for people to change their name or e-mail address.
> To facilitate this, Git provides support for the `.mailmap` file,
> which contains a list of identities and previously used e-mail
> addresses that are associated with that identity.
>
> Unfortunately, while Git's support for the `.mailmap` file is generally
> excellent, I recently discovered that `git log` does not treat the
> mail map file the same as the other tools, instead requiring an
> explicit flag to use the mailmap file.

Make "the other tools" a bit more explicit.  Making things
consistent is good but which way the consistency should go
needs more data than the above to decide.

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.

Thanks.

  parent reply	other threads:[~2019-07-11 19:30 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 ` Junio C Hamano [this message]
2019-07-11 19:34   ` [PATCH v4 0/3] use mailmap by default in " Junio C Hamano
2019-07-12  8:40     ` Ariadne Conill
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=xmqqy314qsgp.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=ariadne@dereferenced.org \
    --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).