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

[BUG?] retrying with "am -3" doesn't work anymore

From
Jeff King <peff@peff.net>
Date
Mar 30, 2016, 02:15 UTC
Message-ID
<20160330021502.GA16077@sigill.intra.peff.net>

I noticed that I could not get a patch from Junio to apply earlier today, and I think it is a regression in the builtin git-am implementation. I had trouble reproducing with a basic test case, though.

Basically, I picked up the three patches from this sub-thread:
  http://thread.gmane.org/gmane.comp.version-control.git/288987/focus=290222
and tried to apply them on top of v2.8.0.
Doing it with "git am -3 patches" works. But doing it with:
  git am patches
  git am -3

doesn't. Bisecting shows that it did work before 783d7e8 (builtin-am: remove redirection to git-am.sh, 2015-08-04).

I tried to tweak t4150 to show this by replacing a "git am -3 foo" with "test_must_fail git am foo && git am -3", but it failed even on older git, which made me think I fumbled the test somehow.

-Peff
Next: Paul Tan
Message 1 of 3 in “[BUG?] retrying with "am -3" doesn't work anymore”
  1. Jeff KingMar 30, 2016
  2. Paul TanMar 30, 2016
  3. Jeff KingMar 30, 2016

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.