Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jf/am-failure-report'
author
Junio C Hamano
<gitster@pobox.com>
Thu, 22 Jan 2009 00:51:18 +0000
(16:51 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 22 Jan 2009 00:51:18 +0000
(16:51 -0800)
* jf/am-failure-report:
git-am: re-fix the diag message printing
git-am: Make it easier to see which patch failed
git-am.sh
patch
|
blob
|
history
raw
(from parent 1:
d9fde06
)
diff --git
a/git-am.sh
b/git-am.sh
index 4beb12dcf5e94c0bc0decf8720f4a622b8b2d325..e20dd88392c892a6b88e29501e0b13be8a73aaf9 100755
(executable)
--- 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