From: Jonas Flodén <jonas@floden.nu>
Date: Fri, 16 Jan 2009 14:34:47 +0000 (+0100)
Subject: git-am: Make it easier to see which patch failed
X-Git-Tag: v1.6.2-rc0~106^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a70d4100d027503f441d696cb2bc60c65349d2e9;p=git.git

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>
---

diff --git a/git-am.sh b/git-am.sh
index 4b157fe5d..ae2fe5651 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