git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Rast <trast@student.ethz.ch>
To: git@vger.kernel.org
Cc: Junio C Hamano <junio@pobox.com>, Jeff King <peff@peff.net>,
	Suraj Kurapati <sunaku@gmail.com>
Subject: [PATCH 2/4] add -p: trap Ctrl-D in 'goto' mode
Date: Mon,  2 Feb 2009 22:46:29 +0100	[thread overview]
Message-ID: <1233611191-18590-3-git-send-email-trast@student.ethz.ch> (raw)
In-Reply-To: <1233611191-18590-2-git-send-email-trast@student.ethz.ch>
In-Reply-To: <7vljspjk8n.fsf@gitster.siamese.dyndns.org>

If the user hit Ctrl-D (EOF) while the script was in 'go to hunk?'
mode, it threw an undefined variable error.  Explicitly test for EOF
and have it re-enter the goto prompt loop.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---
 git-add--interactive.perl |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 551b447..3bf0cda 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -994,6 +994,9 @@ sub patch_update_file {
 					}
 					print "go to which hunk$extra? ";
 					$response = <STDIN>;
+					if (!defined $response) {
+						$response = '';
+					}
 					chomp $response;
 				}
 				if ($response !~ /^\s*\d+\s*$/) {
-- 
1.6.1.2.513.g04677

  parent reply	other threads:[~2009-02-02 21:49 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-01 20:35 [RFC PATCH] add -p: prompt for single characters Thomas Rast
2009-02-02  3:31 ` Suraj Kurapati
2009-02-02  8:34   ` Thomas Rast
2009-02-02  8:50     ` Junio C Hamano
2009-02-02 21:46       ` [PATCH 0/4] add -p: Term::ReadKey and more Thomas Rast
2009-02-02 21:46       ` [PATCH 1/4] add -p: change prompt separator for 'g' Thomas Rast
2009-02-02 21:46       ` Thomas Rast [this message]
2009-02-02 21:46       ` [PATCH 3/4] add -p: optionally prompt for single characters Thomas Rast
2009-02-03  6:24         ` Jeff King
2009-02-03  8:54           ` [Illustration PATCH] add -i: accept single-keypress input Thomas Rast
2009-02-03  9:05             ` Junio C Hamano
2009-02-03  9:35               ` Thomas Rast
2009-02-04  5:10                 ` Junio C Hamano
2009-02-04  8:51                   ` Thomas Rast
2009-02-04 19:42           ` [PATCH 3/4] add -p: optionally prompt for single characters Thomas Rast
2009-02-04 20:08             ` [PATCH v2 3/4] add -p: " Thomas Rast
2009-02-04 20:08             ` [PATCH v2 4/4] add -p: print errors in separate color Thomas Rast
2009-02-04 20:12             ` [PATCH v3 3/4] add -p: prompt for single characters Thomas Rast
2009-02-04 20:12             ` [PATCH v3 4/4] add -p: print errors in separate color Thomas Rast
2009-02-04 20:40             ` [PATCH 3/4] add -p: optionally prompt for single characters Junio C Hamano
2009-02-05  8:28               ` [PATCH v4 3/4] add -p: " Thomas Rast
2009-02-06 14:01                 ` Jeff King
2009-02-06 19:30                   ` [PATCH] add -p: import Term::ReadKey with 'require' Thomas Rast
2009-02-06 20:30                     ` Jeff King
2009-02-06 23:21                       ` Thomas Rast
2009-02-07  4:54                         ` Jeff King
2009-02-07  7:50                           ` Junio C Hamano
2009-02-05  8:28               ` [PATCH v4 4/4] add -p: print errors in separate color Thomas Rast
2009-02-02 21:46       ` [PATCH 4/4] add -p: print errors in help colors Thomas Rast
2009-02-02 13:19 ` [RFC PATCH] add -p: prompt for single characters Jeff King

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=1233611191-18590-3-git-send-email-trast@student.ethz.ch \
    --to=trast@student.ethz.ch \
    --cc=git@vger.kernel.org \
    --cc=junio@pobox.com \
    --cc=peff@peff.net \
    --cc=sunaku@gmail.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).