summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-22 19:56:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-07-22 19:56:02 (GMT)
commit80ee1e04698d21d6d18e051a8d4d95b922a867f0 (patch)
tree28e1fc87dfd2f7fd779b1cb71a912f883395902e /git-am.sh
parent15b3c82cbb345c890400119134fb9709790696d8 (diff)
parent14bf2d58bc3b202da3ca34cfdf72392889135411 (diff)
downloadgit-80ee1e04698d21d6d18e051a8d4d95b922a867f0.zip
git-80ee1e04698d21d6d18e051a8d4d95b922a867f0.tar.gz
git-80ee1e04698d21d6d18e051a8d4d95b922a867f0.tar.bz2
Merge branch 'pg/maint-1.7.9-am-where-is-patch'
When "git am" failed, old timers knew to check .git/rebase-apply/patch to see what went wrong, but we never told the users about it. * pg/maint-1.7.9-am-where-is-patch: am: indicate where a failed patch is to be found
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 b6a5300..c02e62d 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -857,6 +857,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