Re: [PATCH/RFC] git-am: Make it easier to see which patch failed
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jan 18, 2009, 05:42 UTC
- Message-ID
- <7vhc3x1874.fsf@gitster.siamese.dyndns.org>
- In-Reply-To
- <636ecac0901160634r586c72a0r9bb63c6f019f5bff@mail.gmail.com>
"Jonas Flodén" <jonas@floden.nu> writes:
Show 31 quoted lines
> 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> > --- > 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.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)"