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
PGPaul Gortmaker <paul.gortmaker@windriver.com>
Date
Jul 12, 2012, 18:32 UTC
Message-ID
<4FFF1821.7030705@windriver.com>
In-Reply-To
<7vhatcc1ql.fsf@alter.siamese.dyndns.org>
On 12-07-12 01:45 PM, Junio C Hamano wrote:
Show 8 quoted lines
> 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.
What I meant by this was the difference between:
	git am 0001-some-standalone-single.patch
vs.
	git am mbox

In the 1st, the standalone patch is 100% clear and easy to access, because we really don't need/care about the unadvertised place.

Maybe I should have said "knows how to get at the single patch"?
Show 13 quoted lines
> 
>> 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).

I'm not 100% sure I'm following what part here is not OK. If you can help me understand that, I'll respin the change accordingly.

Is it the assumption that the user will have the patch command in /usr/bin not OK, or that the message implies that git is somehow using /usr/bin/patch is not OK?

In case it helps any, a brief summary of my workflow is this:

git am /tmp/mbox <some random fail halfway in the queue> patch -p1 --dry-run < .git/rebase-apply/patch # gauge status. Is patch really invalid, or already applied? # already applied; "git am --skip" # no, if valid, but with minor issues, apply what we can. patch -p1 < .git/rebase-apply/patch # manually deal with rejects (typically with wiggle) git add any_new_files git add -u git am -r

Paul. --

> 
>
Previous: Junio C HamanoNext: Junio C Hamano
Message 3 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.