[PATCH/WIP v3 15/31] am: don't accept patches when there's a session in progress
From: Paul Tan <hidden>
Date: 2016-06-15 23:05:22
Subsystem:
the rest · Maintainer:
Linus Torvalds
Since d1c5f2a (Add git-am, applymbox replacement., 2005-10-07), git-am
would error out if the user gave it mbox(s) on the command-line, but
there was a session in progress.
Since c95b138 (Fix git-am safety checks, 2006-09-15), git-am would
detect if the user attempted to feed it a mbox via stdin, by checking if
stdin is not a tty and there is no resume command given.
Re-implement the above two safety checks.
Signed-off-by: Paul Tan <redacted>
---
Notes:
NOTE: there's no test for this
builtin/am.c | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/builtin/am.c b/builtin/am.c
index 7053b8f..4adc487 100644
--- a/builtin/am.c
+++ b/builtin/am.c@@ -1003,9 +1003,24 @@ int cmd_am(int argc, const char **argv, const char *prefix) if (read_index_preload(&the_index, NULL) < 0) die(_("failed to read the index")); - if (am_in_progress(&state)) + if (am_in_progress(&state)) { + /* + * Catch user error to feed us patches when there is a session + * in progress: + * + * 1. mbox path(s) are provided on the command-line. + * 2. stdin is not a tty: the user is trying to feed us a patch + * from standard input. This is somewhat unreliable -- stdin + * could be /dev/null for example and the caller did not + * intend to feed us a patch but wanted to continue + * unattended. + */ + if (argc || (!opt_resume && !isatty(0))) + die(_("previous rebase directory %s still exists but mbox given."), + state.dir.buf); + am_load(&state); - else { + } else { struct string_list paths = STRING_LIST_INIT_DUP; int i;
--
2.1.4