add--interactive: handle EOF in prompt_yesno

peff · gitster · commit d5addcf522de · 2017-06-21T14:06:09.000-07:00
The prompt_yesno function loops indefinitely waiting for a
"y" or "n" response. But it doesn't handle EOF, meaning
that we can end up in an infinite loop of reading EOF from
stdin. One way to simulate that is with:

  echo e | GIT_EDITOR='echo corrupt &gt;' git add -p

Let's break out of the loop and propagate the undef to the
caller. Without modifying the callers that effectively turns
it into a "no" response. This is reasonable for both of the
current callers, and it leaves room for any future caller to
check for undef explicitly.

Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
@@ -1152,6 +1152,7 @@ sub prompt_yesno {
 	while (1) {
 		print colored $prompt_color, $prompt;
 		my $line = prompt_single_character;
+		return undef unless defined $line;
 		return 0 if $line =~ /^n/i;
 		return 1 if $line =~ /^y/i;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1152,6 +1152,7 @@ sub prompt_yesno {`
`1152`	`1152`	`while (1) {`
`1153`	`1153`	`print colored $prompt_color, $prompt;`
`1154`	`1154`	`my $line = prompt_single_character;`
	`1155`	`+ return undef unless defined $line;`
`1155`	`1156`	`return 0 if $line =~ /^n/i;`
`1156`	`1157`	`return 1 if $line =~ /^y/i;`
`1157`	`1158`	`}`