From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 22 Jan 2009 00:51:18 +0000 (-0800)
Subject: Merge branch 'jf/am-failure-report'
X-Git-Tag: v1.6.2-rc0~106
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/07adc43f3a17a34111e17eadef3f6f4eef3eb67a?hp=d9fde065bd808fbbad3b53e10e160c8f8193b577

Merge branch 'jf/am-failure-report'

* jf/am-failure-report:
git-am: re-fix the diag message printing
git-am: Make it easier to see which patch failed
---

diff --git a/git-am.sh b/git-am.sh
index 4beb12dcf5..e20dd88392 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -510,7 +510,7 @@ do
 	fi
 	if test $apply_status != 0
 	then
-		echo Patch failed at $msgnum.
+		printf 'Patch failed at %s %s\n' "$msgnum" "$FIRSTLINE"
 		stop_here_user_resolve $this
 	fi