summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-21 16:51:18 -0800
committerJunio C Hamano <gitster@pobox.com>2009-01-21 16:51:18 -0800
commit07adc43f3a17a34111e17eadef3f6f4eef3eb67a (patch)
treeab70e6cab3eaa71d3d1c7dec86fa9c703ed1d6f7
parentd9fde065bd808fbbad3b53e10e160c8f8193b577 (diff)
parent4d2e283a1ecda43de9b5cafea27b68a08dfd5767 (diff)
downloadgit-07adc43f3a17a34111e17eadef3f6f4eef3eb67a.tar.gz
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
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
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