From: Jeff King <peff@peff.net> To: Alejandro Sanchez <asanchez1987@gmail.com> Cc: git@vger.kernel.org Subject: [PATCH 1/4] am: simplify prompt response handling Date: Mon, 20 May 2019 08:07:15 -0400 Message-ID: <20190520120715.GA11212@sigill.intra.peff.net> (raw) In-Reply-To: <20190520120636.GA12634@sigill.intra.peff.net> 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(-) 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; -- 2.22.0.rc1.539.g7bfcdfe86d
next prev parent reply other threads:[~2019-05-20 12:07 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-05-20 8:35 Abort (core dumped) Alejandro Sanchez 2019-05-20 10:02 ` Jeff King 2019-05-20 12:06 ` [PATCH 0/4] fix BUG() with "git am -i --resolved" Jeff King 2019-05-20 12:07 ` Jeff King [this message] 2019-05-20 12:09 ` [PATCH 2/4] am: read interactive input from stdin Jeff King 2019-05-20 12:11 ` [PATCH 3/4] am: drop tty requirement for --interactive Jeff King 2019-05-20 12:50 ` Jeff King 2019-05-23 6:44 ` Johannes Schindelin 2019-05-24 6:27 ` Jeff King 2019-05-20 12:13 ` [PATCH 4/4] am: fix --interactive HEAD tree resolution Jeff King 2019-05-23 7:12 ` Johannes Schindelin 2019-05-24 6:39 ` Jeff King 2019-05-24 6:46 ` [PATCH v2 " Jeff King 2019-05-28 11:06 ` [PATCH " Johannes Schindelin 2019-05-28 21:35 ` Jeff King 2019-05-29 11:56 ` Johannes Schindelin 2019-09-26 14:20 ` Alejandro Sanchez 2019-09-26 21:11 ` Jeff King
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190520120715.GA11212@sigill.intra.peff.net \ --to=peff@peff.net \ --cc=asanchez1987@gmail.com \ --cc=git@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
git@vger.kernel.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ https://public-inbox.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git