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>
Jonas Flodén committed
Jan 16, 2009 at 15:34 UTC
a70d4100d027503f441d696cb2bc60c65349d2e9
1 file changed
+1
-1
git-am.sh
+1
-1
@@ -501,7 +501,7 @@ do
501
fi
502
if test $apply_status != 0
503
then
504
- echo Patch failed at $msgnum.
504
+ echo "Patch failed at $msgnum $FIRSTLINE"
505
stop_here_user_resolve $this
506
fi
507