Re: [PATCH/RFC] git-am: Make it easier to see which patch failed
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:45:58
"Jonas Flodén" [off-list ref] writes:
quoted hunk
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 <redacted> --- Johannes Schindelin wrote:quoted
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.sh index 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
Looks sane except that I do not think you need printf nor the leading blank line, i.e. echo "Patch failed at $msgnum ($FIRSTLINE)"