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 justbefore the resolve message to make it easier to find.
Signed-off-by: Jonas Flodén <jonas@xxxxxxxxx>---Johannes Schindelin wrote:> Maybe>> - echo Patch failed at $msgnum.> + echo Patch failed at $msgnum($FIRSTLINE).
How about this instead. Though the line could get very long.This makes the line stand out a little more.
git-am.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-am.sh b/git-am.shindex 4b157fe..09c2f9c 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.+ printf '\nPatch failed at %s (%s)\n' "$msgnum" "$FIRSTLINE" stop_here_user_resolve $this fi
-- 1.6.1.28.gc32f76��.n��������+%������w��{.n��������n�r������&��z�ޗ�zf���h���~����������_��+v���)ߣ�m
