> > 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)" Hmm, IIRC if $FIRSTLINE contains \n or something like that, it will interpret this as newline in some shell/echo implementations. So printf "...%s..." "$FOO" is always sane for user input. Regards, Stephan -- Stephan Beyer <s-beyer@xxxxxxx>, PGP 0x6EDDD207FCC5040F -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
