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	blame: add --line-porcelain output format	2011-05-09 15:27:50 -07:00
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
clean.c
clone.c
commit-tree.c
commit.c
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
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
hash-object.c
help.c
index-pack.c
init-db.c
log.c
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	sparse: Fix an "symbol 'merge_file' not decared" warning	2011-04-11 10:35:25 -07:00
merge.c	Merge branch 'jk/format-patch-am'	2011-05-31 12:19:11 -07:00
mktag.c	read_sha1_file(): get rid of read_sha1_file_repl() madness	2011-05-15 15:23:33 -07:00
mktree.c
mv.c	i18n: git-mv "bad" messages	2011-03-09 23:52:56 -08:00
name-rev.c
notes.c
pack-objects.c
pack-redundant.c
pack-refs.c
patch-id.c
prune-packed.c
prune.c	add description parameter to OPT__DRY_RUN	2010-11-15 09:57:37 -08:00
push.c
read-tree.c
receive-pack.c
reflog.c
remote-ext.c
remote-fd.c
remote.c
replace.c
rerere.c
reset.c
rev-list.c
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
show-branch.c
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