[PATCH 3/4] am: drop tty requirement for --interactive
- From
Jeff King <peff@peff.net>
- Date
- May 20, 2019, 12:11 UTC
- Message-ID
- <20190520121113.GC11212@sigill.intra.peff.net>
- In-Reply-To
- <20190520120636.GA12634@sigill.intra.peff.net>
We have required that the stdin of "am --interactive" be a tty since a1451104ac (git-am: interactive should fail gracefully., 2005-10-12). However, this isn't strictly necessary, and makes the tool harder to test (and is unlike all of our other --interactive commands).
The goal of that commit was to make sure that somebody does not do:
git am --interactive <mbox
and cause us to read commands from the mbox. But we can simply check up front for this case and complain before entering the interactive loop.
Technically this disallows:
git am --interactive </dev/null
where our lack of patches means we would never prompt for anything, and so the old code would not notice our lack of tty (and now we'd die early). But since such a command is totally pointless, it's no loss.
Signed-off-by: Jeff King <peff@peff.net> --- builtin/am.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/am.c b/builtin/am.c index 47ad7a5a70..ea16b844f1 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1643,9 +1643,6 @@ static int do_interactive(struct am_state *state) { assert(state->msg); - if (!isatty(0)) - die(_("cannot be interactive without stdin connected to a terminal.")); - for (;;) { char reply[64]; @@ -2334,6 +2331,9 @@ int cmd_am(int argc, const char **argv, const char *prefix) argv_array_push(&paths, mkpath("%s/%s", prefix, argv[i])); } + if (state.interactive && !paths.argc) + die(_("interactive mode requires patches on the command line")); + am_setup(&state, patch_format, paths.argv, keep_cr); argv_array_clear(&paths);
-- 2.22.0.rc1.539.g7bfcdfe86d