On Wed, Oct 5, 2011 at 5:55 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> I think the sequencer state needs to be removed when the command aborts.
Or written later in do_pick_commit().
> This needs to be fixed before 1.7.7.1.
Something like this?
diff --git i/builtin/revert.c w/builtin/revert.c
index 3117776c2c..f7fcc88871 100644
--- i/builtin/revert.c
+++ w/builtin/revert.c
@@ -384,6 +384,7 @@ static int do_pick_commit(void)
char *defmsg = NULL;
struct strbuf msgbuf = STRBUF_INIT;
int res;
+ int record_cherry_pick_head = 0;
if (no_commit) {
/*
@@ -477,7 +478,7 @@ static int do_pick_commit(void)
strbuf_addstr(&msgbuf, ")\n");
}
if (!no_commit)
- write_cherry_pick_head();
+ record_cherry_pick_head = 1;
}
if (!strategy || !strcmp(strategy, "recursive") || action == REVERT) {
@@ -514,6 +515,9 @@ static int do_pick_commit(void)
free_message(&msg);
free(defmsg);
+ if (record_cherry_pick_head)
+ write_cherry_pick_head();
+
return res;
}
--
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