summaryrefslogtreecommitdiff
path: root/read-cache.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-11 09:40:25 -0700
committerJunio C Hamano <gitster@pobox.com>2012-07-11 09:40:25 -0700
commit01388518c30c20ccbbb9f99e00314ef291ecda37 (patch)
treea7defc1b2c8aee9ed07e59a5fa6cd6b81b87e994 /read-cache.c
parent299666cc5c792dbc3b67622fcc03d41ff95f4346 (diff)
parentd5f53338ab2ee29c588f46d5cb28d7e3b25018f2 (diff)
downloadgit-01388518c30c20ccbbb9f99e00314ef291ecda37.tar.gz
Merge branch 'tg/maint-cache-name-compare' into tg/ce-namelen-field
* 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 ef355cc9a8..b645827c06 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)