git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v4 0/3] use mailmap by default in git log

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 11, 2019, 19:34 UTC
Message-ID
<xmqqtvbsqs9x.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<xmqqy314qsgp.fsf@gitster-ct.c.googlers.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 22 quoted lines
> 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.

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.

Previous: Junio C HamanoNext: Ariadne Conill
Message 7 of 12 in “use mailmap by default in git log”
  1. 0/3 use mailmap by default in git logAriadne Conill, Jul 11, 2019
  2. 1/3 log: use mailmap by defaultAriadne Conill, Jul 11, 2019
  3. 2/3 log: document --no-use-mailmap optionAriadne Conill, Jul 11, 2019
  4. 3/3 tests: rework mailmap tests for git logAriadne Conill, Jul 11, 2019
  5. Martin ÅgrenJul 11, 2019
  6. Junio C HamanoJul 11, 2019
  7. Junio C HamanoJul 11, 2019
  8. Ariadne ConillJul 12, 2019
  9. Junio C HamanoJul 12, 2019
  10. Junio C HamanoJul 12, 2019
  11. Ariadne ConillJul 12, 2019
  12. CB BaileySep 22, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.