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>
Jeff King committed
May 20, 2019 at 08:07 UTC
1db65f324ecf246f7f5f8e0158daab0420dd18bc
1 file changed
+1
-3
builtin/am.c
+1
-3
@@ -1658,9 +1658,7 @@ static int do_interactive(struct am_state *state)
1658
*/
1659
reply = git_prompt(_("Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "), PROMPT_ECHO);
1660
1661
- if (!reply) {
1662
- continue;
1663
- } else if (*reply == 'y' || *reply == 'Y') {
1661
+ if (*reply == 'y' || *reply == 'Y') {
1662
return 0;
1663
} else if (*reply == 'a' || *reply == 'A') {
1664
state->interactive = 0;