Since 0c15cc9 (git-am: --resolved., 2005-11-16), git-am supported
resuming from a failed patch application. The user will manually apply
the patch, and the run git am --resolved which will then commit the
resulting index. Re-implement this feature by introducing am_resolve().
Since it makes no sense for the user to run am --resolved when there is
no session in progress, we error out in this case.
Signed-off-by: Paul Tan <pyoka...@gmail.com>
---
builtin/am.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 54 insertions(+), 1 deletion(-)
diff --git a/builtin/am.c b/builtin/am.c
index 9d6ab2a..4381164 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -707,6 +707,34 @@ next:
}
/**
+ * Resume the current am session after patch application failure. The user did
+ * all the hard work, and we do not have to do any patch application. Just
+ * trust and commit what the user has in the index and working tree.
+ */
+static void am_resolve(struct am_state *state)
+{
+ printf_ln(_("Applying: %s"), firstline(state->msg.buf));
+
+ if (!index_has_changes(NULL)) {
+ printf_ln(_("No changes - did you forget to use 'git add'?\n"
+ "If there is nothing left to stage, chances are that
something else\n"
+ "already introduced the same changes; you might want to
skip this patch."));
+ exit(128);
+ }
+
+ if (unmerged_cache()) {
+ printf_ln(_("You still have unmerged paths in your index.\n"
+ "Did you forget to use 'git add'?"));
+ exit(128);
+ }
+
+ do_commit(state);
+
+ am_next(state);
+ am_run(state);
+}
+
+/**
* parse_options() callback that validates and sets opt->value to the
* PATCH_FORMAT_* enum value corresponding to `arg`.
*/
@@ -721,17 +749,30 @@ static int parse_opt_patchformat(const struct option
*opt, const char *arg, int
return 0;
}
+enum resume_mode {
+ RESUME_FALSE = 0,
+ RESUME_RESOLVED
+};
+
static struct am_state state;
static int opt_patch_format;
+static enum resume_mode opt_resume;
static const char * const am_usage[] = {
N_("git am [options] [(<mbox>|<Maildir>)...]"),
+ N_("git am [options] --continue"),
NULL
};
static struct option am_options[] = {
OPT_CALLBACK(0, "patch-format", &opt_patch_format, N_("format"),
N_("format the patch(es) are in"), parse_opt_patchformat),
+ OPT_CMDMODE(0, "continue", &opt_resume,
+ N_("continue applying patches after resolving a conflict"),
+ RESUME_RESOLVED),
+ OPT_CMDMODE('r', "resolved", &opt_resume,
+ N_("synonyms for --continue"),
+ RESUME_RESOLVED),
OPT_END()
};
@@ -768,6 +809,9 @@ int cmd_am(int argc, const char **argv, const char *prefix)
struct string_list paths = STRING_LIST_INIT_DUP;
int i;
+ if (opt_resume)
+ die(_("Resolve operation not in progress, we are not
resuming."));
+
for (i = 0; i < argc; i++) {
if (is_absolute_path(argv[i]) || !prefix)
string_list_append(&paths, argv[i]);
@@ -780,7 +824,16 @@ int cmd_am(int argc, const char **argv, const char *prefix)
string_list_clear(&paths, 0);
}
- am_run(&state);
+ switch (opt_resume) {
+ case RESUME_FALSE:
+ am_run(&state);
+ break;
+ case RESUME_RESOLVED:
+ am_resolve(&state);
+ break;
+ default:
+ die("BUG: invalid resume value");
+ }
am_state_release(&state);
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
