From a70d4100d027503f441d696cb2bc60c65349d2e9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jonas=20Flod=C3=A9n?= Date: Fri, 16 Jan 2009 15:34:47 +0100 Subject: [PATCH] git-am: Make it easier to see which patch failed MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Junio C Hamano --- git-am.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-am.sh b/git-am.sh index 4b157fe5d..ae2fe5651 100755 --- a/git-am.sh +++ b/git-am.sh @@ -501,7 +501,7 @@ do fi if test $apply_status != 0 then - echo Patch failed at $msgnum. + echo "Patch failed at $msgnum $FIRSTLINE" stop_here_user_resolve $this fi -- 2.30.2