From 9fa8aecdebf6339ad4f897ee45f36192fd75325e Mon Sep 17 00:00:00 2001 From: Jay Soffian Date: Thu, 6 Oct 2011 13:48:35 -0400 Subject: revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so do_pick_commit() writes out CHERRY_PICK_HEAD before invoking merge (either via do_recursive_merge() or try_merge_command()) on the assumption that if the merge fails it is due to conflict. However, if the tree is dirty, the merge may not even start, aborting before do_pick_commit() can remove CHERRY_PICK_HEAD. Instead, defer writing CHERRY_PICK_HEAD till after merge has returned. At this point we know the merge has either succeeded or failed due to conflict. In either case, we want CHERRY_PICK_HEAD to be written so that it may be picked up by the subsequent invocation of commit. Note that do_recursive_merge() aborts if the merge cannot start, while try_merge_command() returns a non-zero value other than 1. Signed-off-by: Jay Soffian Signed-off-by: Junio C Hamano --- builtin/revert.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'builtin/revert.c') diff --git a/builtin/revert.c b/builtin/revert.c index 1f27c63343..5f9fa44db4 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -481,8 +481,6 @@ static int do_pick_commit(void) strbuf_addstr(&msgbuf, sha1_to_hex(commit->object.sha1)); strbuf_addstr(&msgbuf, ")\n"); } - if (!no_commit) - write_cherry_pick_head(); } if (!strategy || !strcmp(strategy, "recursive") || action == REVERT) { @@ -503,6 +501,15 @@ static int do_pick_commit(void) free_commit_list(remotes); } + /* + * If the merge was clean or if it failed due to conflict, we write + * CHERRY_PICK_HEAD for the subsequent invocation of commit to use. + * However, if the merge did not even start, then we don't want to + * write it at all. + */ + if (action == CHERRY_PICK && !no_commit && (res == 0 || res == 1)) + write_cherry_pick_head(); + if (res) { error(action == REVERT ? _("could not revert %s... %s") -- cgit v1.2.1