aboutsummaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-11 09:08:28 -0700
committerJunio C Hamano <gitster@pobox.com>2012-07-11 09:25:56 -0700
commitd5f53338ab2ee29c588f46d5cb28d7e3b25018f2 (patch)
tree8cacf7445546eac4ec9cfd6c468f03be80121527 /git-mergetool.sh
parentcb198b3b67feb2c0a6f22199ec14fa48d18ac1ce (diff)
downloadgit-d5f53338ab2ee29c588f46d5cb28d7e3b25018f2.tar.gz
git-d5f53338ab2ee29c588f46d5cb28d7e3b25018f2.tar.xz
cache_name_compare(): do not truncate while comparing paths
We failed to use ce_namelen() equivalent and instead only compared up to the CE_NAMEMASK bytes by mistake. Adding an overlong path that shares the same common prefix as an existing entry in the index did not add a new entry, but instead replaced the existing one, as the result. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions