mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tg/maint-cache-name-compare'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2012-07-15 21:40:17 -07:00
parent 37b92a9a2e d5f53338ab
commit 8fc824f397
2 changed files with 48 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
read-cache.c
View File

@ -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)