From: Jeff King <peff@peff.net>
Date: Mon, 20 May 2019 12:07:15 +0000 (-0400)
Subject: am: simplify prompt response handling
X-Git-Tag: v2.23.0-rc0~121^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1db65f324ecf246f7f5f8e0158daab0420dd18bc?hp=--cc

am: simplify prompt response handling

We'll never see a NULL returned from git_prompt(); if it can't produce
any input for us (e.g., because the terminal got EOF) then it will just
die().

So there's no need for us to handle NULL here. And even if there was, it
doesn't make sense to continue; on a true terminal hangup we'd just loop
infinitely trying to get input that will never come.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

1db65f324ecf246f7f5f8e0158daab0420dd18bc
diff --git a/builtin/am.c b/builtin/am.c
index 58a2aef28b..56b1738777 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1658,9 +1658,7 @@ static int do_interactive(struct am_state *state)
 		 */
 		reply = git_prompt(_("Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "), PROMPT_ECHO);
 
-		if (!reply) {
-			continue;
-		} else if (*reply == 'y' || *reply == 'Y') {
+		if (*reply == 'y' || *reply == 'Y') {
 			return 0;
 		} else if (*reply == 'a' || *reply == 'A') {
 			state->interactive = 0;