summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2012-07-13 15:51:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-07-13 23:02:48 (GMT)
commit14bf2d58bc3b202da3ca34cfdf72392889135411 (patch)
treeaa173a50d769a9a0400295436681ceedc9de88ff /git-am.sh
parentd0f1ea6003d97e63110fa7d50bb07f546a909b6e (diff)
downloadgit-14bf2d58bc3b202da3ca34cfdf72392889135411.zip
git-14bf2d58bc3b202da3ca34cfdf72392889135411.tar.gz
git-14bf2d58bc3b202da3ca34cfdf72392889135411.tar.bz2
am: indicate where a failed patch is to be found
If "git am" fails to apply something, the end user may need to know where to find the patch that failed to apply, so that the user can do other things (e.g. trying "GNU patch" on it, running "diffstat" to see what it tried to change, etc.) The input to "am" may have contained more than one patch, or the message may have been MIME encoded, and knowing what the user fed to "am" does not help very much for this purpose. Also introduce advice.amworkdir configuration to allow people who learned where to look to squelch this message. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/git-am.sh b/git-am.sh
index cb833e2..f1ae932 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -834,6 +834,11 @@ did you forget to use 'git add'?"
if test $apply_status != 0
then
eval_gettextln 'Patch failed at $msgnum $FIRSTLINE'
+ if test "$(git config --bool advice.amworkdir)" != false
+ then
+ eval_gettextln "The copy of the patch that failed is found in:
+ $dotest/patch"
+ fi
stop_here_user_resolve $this
fi