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
2009-01-21 16:51:18 -08:00 · 2009-01-21 16:51:18 -08:00 · 07adc43f3a
parent d9fde065bd 4d2e283a1e
commit 07adc43f3a
1 changed files with 1 additions and 1 deletions
--- 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