| Message ID | 20190520120715.GA11212@sigill.intra.peff.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fix BUG() with "git am -i --resolved" | expand |
diff --git a/builtin/am.c b/builtin/am.c index 912d9821b1..644bb11f6c 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1661,9 +1661,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;
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> --- builtin/am.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)