git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Robin Rosenberg <robin.rosenberg@dewire.com>
Cc: junkio@cox.net, git@vger.kernel.org
Subject: Re: [PATCH] Abort mergetool on read error from stdinput
Date: Thu, 2 Dec 2010 00:38:51 -0600	[thread overview]
Message-ID: <20101202063851.GA1407@burratino> (raw)
In-Reply-To: <1291271301-12511-1-git-send-email-robin.rosenberg@dewire.com>

Hi Robin,

Robin Rosenberg wrote:

> infinite loop that is somewhat tricky to stop. Abort the script
> if bash read fails.
>
> Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>

That motivates half the change.

> --- a/git-mergetool--lib.sh
> +++ b/git-mergetool--lib.sh
> @@ -35,7 +35,7 @@ check_unchanged () {
>  		while true; do
>  			echo "$MERGED seems unchanged."
>  			printf "Was the merge successful? [y/n] "
> -			read answer
> +			read answer < /dev/tty || exit 1

Why not
			read answer || exit 1

so tests can still run without blocking?  Aside from that, this looks
like a good change; thanks.

What platform are you on?  ^C kills the entire process group here.

  reply	other threads:[~2010-12-02  6:39 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-02  6:28 [PATCH] Abort mergetool on read error from stdinput Robin Rosenberg
2010-12-02  6:38 ` Jonathan Nieder [this message]
2010-12-03  9:05   ` Robin Rosenberg
2010-12-03  9:14     ` Jonathan Nieder
2010-12-03 19:45     ` 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=20101202063851.GA1407@burratino \
    --to=jrnieder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    --cc=robin.rosenberg@dewire.com \
    /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).