diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-07-15 21:40:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-15 21:40:18 -0700 |
| commit | 8fc824f397b2d10a2643a6177ff03c56b1017673 (patch) | |
| tree | 398465ee583ffbebf2e68c805a7bb1de8a179b1f /read-cache.c | |
| parent | Merge branch 'jk/index-pack-streaming-fix' (diff) | |
| parent | cache_name_compare(): do not truncate while comparing paths (diff) | |
| download | tgif-8fc824f397b2d10a2643a6177ff03c56b1017673.tar.xz | |
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.c | 13 |
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) |