Code

revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so
authorJay Soffian <jaysoffian@gmail.com>
Thu, 6 Oct 2011 17:48:35 +0000 (13:48 -0400)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Oct 2011 23:56:34 +0000 (16:56 -0700)
commit9fa8aecdebf6339ad4f897ee45f36192fd75325e
treef6726403593e53ece0fd93e587bfa2975f9e6d4b
parentf696543dad6c7ba27b0c4fab167a5687263a9ba0
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 <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/revert.c
t/t3507-cherry-pick-conflict.sh