Browse Source

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>
maint
Jeff King 6 years ago committed by Junio C Hamano
parent
commit
1db65f324e
  1. 4
      builtin/am.c

4
builtin/am.c

@ -1658,9 +1658,7 @@ static int do_interactive(struct am_state *state) @@ -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;

Loading…
Cancel
Save