summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJonas Flodén <jonas@floden.nu>2009-01-16 15:34:47 +0100
committerJunio C Hamano <gitster@pobox.com>2009-01-17 21:43:33 -0800
commita70d4100d027503f441d696cb2bc60c65349d2e9 (patch)
treeb81480e5a6da9531a483840c5c52de4c13c89ea2 /git-am.sh
parent7bbd8d6c139f163ee26b8416cd227408888f31c3 (diff)
downloadgit-a70d4100d027503f441d696cb2bc60c65349d2e9.tar.gz
git-am: Make it easier to see which patch failed
When git-am fails it's not always easy to see which patch failed, since it's often hidden by a lot of error messages. Add an extra line which prints the name of the failed patch just before the resolve message to make it easier to find. Signed-off-by: Jonas Flodén <jonas@floden.nu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index 4b157fe5d5..ae2fe5651c 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -501,7 +501,7 @@ do
fi
if test $apply_status != 0
then
- echo Patch failed at $msgnum.
+ echo "Patch failed at $msgnum $FIRSTLINE"
stop_here_user_resolve $this
fi