Jay Soffian 9fa8aecdeb 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>

2011-10-06 16:56:34 -07:00

..

add.c

…

annotate.c

…

apply.c

…

archive.c

…

bisect--helper.c

…

blame.c

…

branch.c

Merge branch 'jk/format-patch-am'

2011-05-31 12:19:11 -07:00

bundle.c

…

cat-file.c

plug a few coverity-spotted leaks

2011-06-20 14:27:36 -07:00

check-attr.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

Merge branch 'jk/format-patch-am'

2011-05-31 12:19:11 -07:00

clean.c

…

clone.c

Merge branch 'ab/i18n-fixup' into maint

2011-05-31 12:00:27 -07:00

commit-tree.c

…

commit.c

Merge branch 'bc/maint-status-z-to-use-porcelain'

2011-06-06 11:40:08 -07:00

config.c

…

count-objects.c

…

describe.c

…

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

plug a few coverity-spotted leaks

2011-06-20 14:27:36 -07:00

fast-export.c

…

fetch-pack.c

…

fetch.c

fetch: do not leak a refspec

2011-06-08 17:21:08 -07:00

fmt-merge-msg.c

…

for-each-ref.c

…

fsck.c

…

gc.c

builtin/gc.c: add missing newline in message

2011-06-19 14:46:39 -07:00

grep.c

Merge branch 'mk/grep-pcre'

2011-05-30 00:00:07 -07:00

hash-object.c

…

help.c

…

index-pack.c

…

init-db.c

Merge branch 'ab/i18n-fixup' into maint

2011-05-31 12:00:27 -07:00

log.c

Merge branch 'jk/format-patch-am'

2011-05-31 12:19:11 -07:00

ls-files.c

…

ls-remote.c

…

ls-tree.c

…

mailinfo.c

…

mailsplit.c

…

merge-base.c

…

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

…

merge.c

Merge branch 'jk/format-patch-am'

2011-05-31 12:19:11 -07:00

mktag.c

…

mktree.c

…

mv.c

…

name-rev.c

…

notes.c

…

pack-objects.c

…

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

…

push.c

…

read-tree.c

…

receive-pack.c

…

reflog.c

…

remote-ext.c

…

remote-fd.c

…

remote.c

Merge branch 'jk/maint-remote-mirror-safer'

2011-05-31 12:08:52 -07:00

replace.c

…

rerere.c

…

reset.c

…

rev-list.c

Merge branch 'jk/format-patch-am'

2011-05-31 12:19:11 -07:00

rev-parse.c

…

revert.c

revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so

2011-10-06 16:56:34 -07:00

rm.c

…

send-pack.c

…

shortlog.c

Merge branch 'jk/format-patch-am'

2011-05-31 12:19:11 -07:00

show-branch.c

Merge branch 'jk/format-patch-am'

2011-05-31 12:19:11 -07:00

show-ref.c

…

stripspace.c

…

symbolic-ref.c

…

tag.c

…

tar-tree.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

plug a few coverity-spotted leaks

2011-06-20 14:27:36 -07:00

update-ref.c

…

update-server-info.c

…

upload-archive.c

…

var.c

…

verify-pack.c

…

verify-tag.c

…

write-tree.c

…