summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--builtin/am.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/am.c b/builtin/am.c
index 9d8437cc26..9cbbd8eda8 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1640,9 +1640,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];
@@ -2327,6 +2324,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);