From: Stephan Beyer <s-beyer@gmx.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Jonas Flodén" <jonas@floden.nu>,
git@vger.kernel.org,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH/RFC] git-am: Make it easier to see which patch failed
Date: Sun, 18 Jan 2009 10:41:13 +0100 [thread overview]
Message-ID: <20090118094113.GE11992@leksak.fem-net> (raw)
In-Reply-To: <7vhc3x1874.fsf@gitster.siamese.dyndns.org>
> > 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@gmx.net>, PGP 0x6EDDD207FCC5040F
next prev parent reply other threads:[~2009-01-18 9:42 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-16 13:18 [PATCH/RFC] git-am: Make it easier to see which patch failed Jonas Flodén
2009-01-16 14:14 ` Johannes Schindelin
2009-01-16 14:34 ` Jonas Flodén
2009-01-16 16:27 ` Johannes Schindelin
2009-01-18 5:42 ` Junio C Hamano
2009-01-18 9:41 ` Stephan Beyer [this message]
2009-01-18 9:53 ` Stephan Beyer
2009-01-18 15:39 ` Jeff King
2009-01-18 16:17 ` Johannes Schindelin
2009-01-18 16:49 ` Thomas Rast
2009-01-18 16:53 ` Stephan Beyer
2009-01-18 17:07 ` Jeff King
2009-01-18 17:44 ` Johannes Schindelin
2009-01-18 17:49 ` Jeff King
2009-01-19 3:38 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090118094113.GE11992@leksak.fem-net \
--to=s-beyer@gmx.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonas@floden.nu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).