@matheusbsbs / matheus-bagliano / commits / 6e7baf246a

am: drop tty requirement for --interactive

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> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed May 20, 2019 at 08:11 UTC 6e7baf246a2d12480d4dbc04c47efb66408c1927

1 file changed +3 -3

builtin/am.c

+3 -3

@@ -1640,9 +1640,6 @@ static int do_interactive(struct am_state *state)

1640 {

1641 assert(state->msg);

1642

1643 - if (!isatty(0))

1644 - die(_("cannot be interactive without stdin connected to a terminal."));

1645 -

1643 for (;;) {

1644 char reply[64];

1645

@@ -2327,6 +2324,9 @@ int cmd_am(int argc, const char **argv, const char *prefix)

2324 argv_array_push(&paths, mkpath("%s/%s", prefix, argv[i]));

2325 }

2326

2327 + if (state.interactive && !paths.argc)

2328 + die(_("interactive mode requires patches on the command line"));

2329 +

2330 am_setup(&state, patch_format, paths.argv, keep_cr);

2331

2332 argv_array_clear(&paths);