From: Jeff King <peff@peff.net>
To: Alejandro Sanchez <asanchez1987@gmail.com>
Cc: git@vger.kernel.org
Subject: [PATCH 2/4] am: read interactive input from stdin
Date: Mon, 20 May 2019 08:09:26 -0400 [thread overview]
Message-ID: <20190520120926.GB11212@sigill.intra.peff.net> (raw)
In-Reply-To: <20190520120636.GA12634@sigill.intra.peff.net>
In the conversion of git-am from shell script to C, we switched to using
git_prompt(). Unlike the original shell command "read reply", this
doesn't read from stdin at all, but rather from /dev/tty.
In most cases this distinction wouldn't matter. We require (as the shell
script did) that stdin is a tty, so they would generally be the same
thing. But one important exception is our test suite: even with
test_terminal, we cannot test "am --interactive" because it insists on
reading from /dev/tty, not the pseudo-tty we've set up in the test
script.
Fixing this clears the way to adding tests in a future patch.
Signed-off-by: Jeff King <peff@peff.net>
---
Part of me dies inside when I look at adding the magical "64". But we
expect this input to be single-line (or at most, somebody might actually
type out "edit", etc), and avoiding strbuf_getline() saves us from
having to free the strbuf in the many early return paths. I dunno. If
it's too ugly it would not be too hard to switch it over.
builtin/am.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/builtin/am.c b/builtin/am.c
index 644bb11f6c..47ad7a5a70 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1647,7 +1647,7 @@ static int do_interactive(struct am_state *state)
die(_("cannot be interactive without stdin connected to a terminal."));
for (;;) {
- const char *reply;
+ char reply[64];
puts(_("Commit Body is:"));
puts("--------------------------");
@@ -1659,7 +1659,9 @@ static int do_interactive(struct am_state *state)
* in your translation. The program will only accept English
* input at this point.
*/
- reply = git_prompt(_("Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "), PROMPT_ECHO);
+ printf(_("Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "));
+ if (!fgets(reply, sizeof(reply), stdin))
+ die("unable to read from stdin; aborting");
if (*reply == 'y' || *reply == 'Y') {
return 0;
--
2.22.0.rc1.539.g7bfcdfe86d
next prev parent reply other threads:[~2019-05-20 12:09 UTC|newest]
Thread overview: 30+ 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 ` [PATCH 1/4] am: simplify prompt response handling Jeff King
2019-05-20 12:09 ` Jeff King [this message]
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
2021-11-02 16:48 ` [PATCH 0/2] prompt.c: split up git_prompt(), read from /dev/tty, not STDIN Ævar Arnfjörð Bjarmason
2021-11-02 16:48 ` [PATCH 1/2] prompt.c: split up the password and non-password handling Ævar Arnfjörð Bjarmason
2021-11-03 11:53 ` Jeff King
2021-11-03 17:28 ` Junio C Hamano
2021-11-02 16:48 ` [PATCH 2/2] prompt.c: add and use a GIT_TEST_TERMINAL_PROMPT=true Ævar Arnfjörð Bjarmason
2021-11-03 11:57 ` Jeff King
2021-11-03 15:12 ` Ævar Arnfjörð Bjarmason
2021-11-04 9:58 ` Jeff King
2021-11-03 17:42 ` Junio C Hamano
2021-11-04 8:48 ` Johannes Schindelin
2021-11-04 9:47 ` Jeff King
2021-11-04 9:53 ` 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=20190520120926.GB11212@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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).