summaryrefslogtreecommitdiff
path: root/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^
diff options
context:
space:
mode:
authorLibravatar Dave Olszewski <cxreg@pobox.com>2009-05-09 14:49:59 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-05-09 21:05:52 -0700
commitbf74106a5b4577fd695d15a28ad51537ae7470d8 (patch)
tree8e6f36a9a3c472f11eb40e073d0e05cef963c100 /t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^
parentGIT 1.6.2.5 (diff)
downloadtgif-bf74106a5b4577fd695d15a28ad51537ae7470d8.tar.xz
merge-recursive: never leave index unmerged while recursing
When you are trying to come up with the final result (i.e. depth=0), you want to record how the conflict arose by registering the state of the common ancestor, your branch and the other branch in the index, hence you want to do update_stages(). When you are merging with positive depth, that is because of a criss-cross merge situation. In such a case, you would need to record the tentative result, with conflict markers and all, as if the merge went cleanly, even if there are conflicts, in order to write it out as a tree object later to be used as a common ancestor tree. update_file() calls update_file_flags() with update_cache=1 to signal that the result needs to be written to the index at stage #0 (i.e. merged), and the code should not clobber the index further by calling update_stages(). The codepath to deal with rename/delete conflict in a recursive merge however left the index unmerged. Signed-off-by: Dave Olszewski <cxreg@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^')
0 files changed, 0 insertions, 0 deletions