• Dave Olszewski's avatar
    merge-recursive: never leave index unmerged while recursing · bf74106a
    Dave Olszewski authored
    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: default avatarDave Olszewski <cxreg@pobox.com>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
t3031-merge-criscross.sh 1.69 KB