On Mon, Jul 13, 2015 at 03:31:37PM -0700, Junio C Hamano wrote:
> A fix is to edit the patch to replace that "flags);" line with full
> "return delete_ref()" line and save it. Then running
>
> $ git am
>
> (no argument) is supposed to read from the corrected patch file and
> continue the application.
>
> This no longer works with the version with this series, it seems.
Ah, this is actually the same bug as the previous one, and it actually
all stems from the fact that I completely overlooked the code path
change introduced by 271440e (git-am: make it easier after fixing up an
unapplicable patch., 2005-10-25). When "git am" is run again while
paused, the mail message should not be re-parsed at all.
So, I'm thinking of something like the following as a separate patch in
this series to re-implement the feature:
diff a/builtin/am.c b/builtin/am.c
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1714,6 +1692,21 @@ static void do_commit(const struct am_state *state)
}
/**
+ * Validates the am_state for resuming -- the "msg" and authorship fields must
+ * be filled up.
+ */
+static void validate_resume_state(const struct am_state *state)
+{
+ if (!state->msg)
+ die(_("cannot resume: %s does not exist."),
+ am_path(state, "final-commit"));
+
+ if (!state->author_name || !state->author_email || !state->author_date)
+ die(_("cannot resume: %s does not exist."),
+ am_path(state, "author-script"));
+}
+
+/**
* Interactively prompt the user on whether the current patch should be
* applied.
*
@@ -1774,8 +1767,12 @@ static int do_interactive(struct am_state *state)
/**
* Applies all queued mail.
+ *
+ * If `resume` is true, we are "resuming". The "msg" and authorship fields, as
+ * well as the state directory's "patch" file is used as-is for applying the
+ * patch and committing it.
*/
-static void am_run(struct am_state *state)
+static void am_run(struct am_state *state, int resume)
{
const char *argv_gc_auto[] = {"gc", "--auto", NULL};
struct strbuf sb = STRBUF_INIT;
@@ -1793,21 +1790,28 @@ static void am_run(struct am_state *state)
while (state->cur <= state->last) {
const char *mail = am_path(state, msgnum(state));
- int apply_status, skip;
+ int apply_status;
if (!file_exists(mail))
goto next;
- if (state->rebasing)
- skip = parse_mail_rebase(state, mail);
- else
- skip = parse_mail(state, mail);
+ if (resume) {
+ validate_resume_state(state);
+ resume = 0;
+ } else {
+ int skip;
+
+ if (state->rebasing)
+ skip = parse_mail_rebase(state, mail);
+ else
+ skip = parse_mail(state, mail);
- if (skip)
- goto next; /* mail should be skipped */
+ if (skip)
+ goto next; /* mail should be skipped */
- write_author_script(state);
- write_commit_msg(state);
+ write_author_script(state);
+ write_commit_msg(state);
+ }
if (state->interactive && do_interactive(state))
goto next;
@@ -1880,13 +1884,7 @@ next:
*/
static void am_resolve(struct am_state *state)
{
- if (!state->msg)
- die(_("cannot resume: %s does not exist."),
- am_path(state, "final-commit"));
-
- if (!state->author_name || !state->author_email || !state->author_date)
- die(_("cannot resume: %s does not exist."),
- am_path(state, "author-script"));
+ validate_resume_state(state);
say(state, stdout, _("Applying: %.*s"), linelen(state->msg), state->msg);
@@ -1915,7 +1913,7 @@ static void am_resolve(struct am_state *state)
next:
am_next(state);
- am_run(state);
+ am_run(state, 0);
}
/**
@@ -2040,7 +2038,7 @@ static void am_skip(struct am_state *state)
die(_("failed to clean index"));
am_next(state);
- am_run(state);
+ am_run(state, 0);
}
/**
@@ -2136,6 +2134,7 @@ static int parse_opt_patchformat(const struct option *opt, const char *arg, int
enum resume_mode {
RESUME_FALSE = 0,
+ RESUME_APPLY,
RESUME_RESOLVED,
RESUME_SKIP,
RESUME_ABORT
@@ -2271,6 +2270,9 @@ int cmd_am(int argc, const char **argv, const char *prefix)
die(_("previous rebase directory %s still exists but mbox given."),
state.dir);
+ if (resume == RESUME_FALSE)
+ resume = RESUME_APPLY;
+
am_load(&state);
} else {
struct argv_array paths = ARGV_ARRAY_INIT;
@@ -2310,7 +2312,10 @@ int cmd_am(int argc, const char **argv, const char *prefix)
switch (resume) {
case RESUME_FALSE:
- am_run(&state);
+ am_run(&state, 0);
+ break;
+ case RESUME_APPLY:
+ am_run(&state, 1);
break;
case RESUME_RESOLVED:
am_resolve(&state);
At this point I've accumulated a lot of changes on my end so I'll do a
re-roll.
Thanks,
Paul
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html