On 12-07-13 03:58 PM, Junio C Hamano wrote:
> Paul Gortmaker <paul.gortma...@windriver.com> writes:
>> If git am fails to apply something, the end user may need
>> to know where to find the patch. This is normally known for
>> a single patch, but if the user is processing a mbox with
>> many patches, they may not have a single broken out patch
>> handy. So, provide a helpful hint as to where they can
>> find the patch to do some sort of manual fixup, if we
>> are processing a mbox with more than one patch in it.
> I would rather see this done even for a single patch mbox. The
OK, I got the opposite impression from your prev. mail when
you mentioned that I hadn't limited the message output at all.
I'm fine with the changes you've proposed below, and can squash that
into a v3 and resend again.
> patch that was fed to "git apply" by "git am" and failed to apply is
> that one, not the one in the mbox you gave "git am". The latter may
> be ungrokkable with GNU patch or "git apply", if the original was
> sent in Quoted-Printable and such MIME funnies, which is the whole
> point of having a separate file there for "git am", instead of
> feeding the original.
> I am not sure if we should limit $patch_format to mbox, but I think
> showing this unconditionally regardless of mbox/stgit/hg will teach
> the user only one location to remember, so perhaps like this?
> Documentation/config.txt | 3 +++
> git-am.sh | 4 ++--
> 2 files changed, 5 insertions(+), 2 deletions(-)
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 0e1168c..b1f0a75 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -143,6 +143,9 @@ advice.*::
> Advice shown when you used linkgit:git-checkout to
> move to the detach HEAD state, to instruct how to create
> a local branch after the fact.
> + amWorkDir::
> + Advice that shows the location of the patch file when
> + linkgit:git-am fails to apply it.
> diff --git a/git-am.sh b/git-am.sh
> index dc48f87..f1ae932 100755
> --- a/git-am.sh
> +++ b/git-am.sh
> @@ -834,9 +834,9 @@ did you forget to use 'git add'?"
> if test $apply_status != 0
> eval_gettextln 'Patch failed at $msgnum $FIRSTLINE'
> - if test $patch_format = mbox && test "$last" -ne "1"
> + if test "$(git config --bool advice.amworkdir)" != false
> - eval_gettextln "You can find the copy of the patch that
> failed here:
> + eval_gettextln "The copy of the patch that failed is
> found in:
> stop_here_user_resolve $this
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html