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

Re: [PATCH] git-am: add am.threeWay config variable

From
Paul Tan <pyokagan@gmail.com>
Date
Aug 19, 2015, 08:33 UTC
Message-ID
<CACRoPnTY8mALN8KbjR0CHeaKOkm2oSLRL9=4X1tU1LmHiJTeNg@mail.gmail.com>
In-Reply-To
<vpqfv3h9bvf.fsf@anie.imag.fr>

On Tue, Aug 18, 2015 at 5:36 PM, Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> wrote:

> I don't remember the details of the regression we had with the shell
> version, but that would probably deserve an additional test to enforce
> the "Hopefully there will be no regressions" part of your message.

Actually, technically, I think this patch by its own would reintroduce the regression ;)

The reason is that the bug was caused by the overall structure of the git-am.sh code, and not the patch itself[1].

This is fixed in another patch series[2] on top of this patch which also implements a test for "git am --3way".

[1] http://thread.gmane.org/gmane.comp.version-control.git/274577 [2] http://thread.gmane.org/gmane.comp.version-control.git/275322

Thanks, Paul

Previous: Matthieu MoyNext: Matthieu Moy
Message 4 of 5 in “git-am: add am.threeWay config variable”
  1. git-am: add am.threeWay config variablePaul Tan, Aug 4, 2015
  2. Johannes SchindelinAug 7, 2015
  3. Matthieu MoyAug 18, 2015
  4. Paul TanAug 19, 2015
  5. Matthieu MoyAug 19, 2015

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.