summaryrefslogtreecommitdiff
path: root/read-cache.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-15 21:40:17 -0700
committerJunio C Hamano <gitster@pobox.com>2012-07-15 21:40:18 -0700
commit8fc824f397b2d10a2643a6177ff03c56b1017673 (patch)
tree398465ee583ffbebf2e68c805a7bb1de8a179b1f /read-cache.c
parent37b92a9a2eb1d49409a0b4d16404a3ac265ca723 (diff)
parentd5f53338ab2ee29c588f46d5cb28d7e3b25018f2 (diff)
downloadgit-8fc824f397b2d10a2643a6177ff03c56b1017673.tar.gz
Merge branch 'tg/maint-cache-name-compare'
Even though the index can record pathnames longer than 1<<12 bytes, in some places we were not comparing them in full, potentially replacing index entries instead of adding. * tg/maint-cache-name-compare: cache_name_compare(): do not truncate while comparing paths
Diffstat (limited to 'read-cache.c')
-rw-r--r--read-cache.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/read-cache.c b/read-cache.c
index 1df6adf0bf..2357afaa60 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -397,10 +397,15 @@ int df_name_compare(const char *name1, int len1, int mode1,
int cache_name_compare(const char *name1, int flags1, const char *name2, int flags2)
{
- int len1 = flags1 & CE_NAMEMASK;
- int len2 = flags2 & CE_NAMEMASK;
- int len = len1 < len2 ? len1 : len2;
- int cmp;
+ int len1, len2, len, cmp;
+
+ len1 = flags1 & CE_NAMEMASK;
+ if (CE_NAMEMASK <= len1)
+ len1 = strlen(name1 + CE_NAMEMASK) + CE_NAMEMASK;
+ len2 = flags2 & CE_NAMEMASK;
+ if (CE_NAMEMASK <= len2)
+ len2 = strlen(name2 + CE_NAMEMASK) + CE_NAMEMASK;
+ len = len1 < len2 ? len1 : len2;
cmp = memcmp(name1, name2, len);
if (cmp)