summaryrefslogtreecommitdiff
path: root/mergetools/gvimdiff
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2018-04-19 10:58:09 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-05-08 16:11:00 +0900
commit5b047ac07084b7b8508ea706a9950fc19709358c (patch)
treefcbf22a55a0ce481e7012497f0f9a5495afe24a5 /mergetools/gvimdiff
parentmerge-recursive: check for file level conflicts then get new name (diff)
downloadtgif-5b047ac07084b7b8508ea706a9950fc19709358c.tar.xz
merge-recursive: when comparing files, don't include trees
get_renames() would look up stage data that already existed (populated in get_unmerged(), taken from whatever unpack_trees() created), and if it didn't exist, would call insert_stage_data() to create the necessary entry for the given file. The insert_stage_data() fallback becomes much more important for directory rename detection, because that creates a mechanism to have a file in the resulting merge that didn't exist on either side of history. However, insert_stage_data(), due to calling get_tree_entry() loaded up trees as readily as files. We aren't interested in comparing trees to files; the D/F conflict handling is done elsewhere. This code is just concerned with what entries existed for a given path on the different sides of the merge, so create a get_tree_entry_if_blob() helper function and use it. Reviewed-by: Stefan Beller <sbeller@google.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/gvimdiff')
0 files changed, 0 insertions, 0 deletions