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

Re: [PATCH] git-am: indicate where a failed patch is to be found.

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 12, 2012, 17:45 UTC
Message-ID
<7vhatcc1ql.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1342108243-8599-1-git-send-email-paul.gortmaker@windriver.com>
Paul Gortmaker <paul.gortmaker@windriver.com> writes:
> If git am wasn't run with --reject, we assume the end user
> knows where to find the patch.  This is normally true for
> a single patch,

Not at all. Whether it is a single or broken, the patch is fed to underlying "apply" from an unadvertised place.

> So, provide a helpful hint as to where they can
> find the patch ...

This is OK, but you may want to give a way to squelch it once the user learns where it is by following the usual "advice.*" thing.

> ... to do the manual fixup before eventually
> continuing with "git add ... ; git am -r".

This is _NOT_ fine, especially if you suggest "patch" the user may not have, and more importantly does not have a clue why "git apply" rejected it ("am" does _not_ use "patch" at all).

Previous: Paul GortmakerNext: Paul Gortmaker
Message 2 of 16 in “git-am: indicate where a failed patch is to be found.”
  1. git-am: indicate where a failed patch is to be found.Paul Gortmaker, Jul 12, 2012
  2. Junio C HamanoJul 12, 2012
  3. Paul GortmakerJul 12, 2012
  4. Junio C HamanoJul 12, 2012
  5. Paul GortmakerJul 12, 2012
  6. Junio C HamanoJul 12, 2012
  7. Paul GortmakerJul 13, 2012
  8. Junio C HamanoJul 13, 2012
  9. Junio C HamanoJul 12, 2012
  10. git-am: indicate where a failed patch is to be found.Paul Gortmaker, Jul 13, 2012
  11. Junio C HamanoJul 13, 2012
  12. Paul GortmakerJul 13, 2012
  13. Junio C HamanoJul 13, 2012
  14. Re: git-am: indicate where a failed patch is to be found.Nicolas Sebrecht, Jul 12, 2012
  15. Junio C HamanoJul 12, 2012
  16. Jeff KingJul 12, 2012

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.