development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 11:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'joero74/icase-name-hash' into devel

Browse source
This commit is contained in:
Johannes Schindelin 2011-10-10 15:27:26 -05:00
parent 1ad7341d97 0a032919e0
commit 8b9ad9fd32
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cache.h
View file

@ -168,6 +168,7 @@ struct cache_entry {
unsigned int ce_flags; unsigned int ce_flags;
unsigned char sha1[20]; unsigned char sha1[20];
struct cache_entry *next; struct cache_entry *next;
struct cache_entry *dir_next;
char name[FLEX_ARRAY]; /* more */ char name[FLEX_ARRAY]; /* more */
}; };

15
name-hash.c
View file

@ -57,12 +57,10 @@ static void hash_index_entry_directories(struct index_state *istate, struct cach
if (*ptr == '/') { if (*ptr == '/') {
++ptr; ++ptr;
hash = hash_name(ce->name, ptr - ce->name); hash = hash_name(ce->name, ptr - ce->name);
if (!lookup_hash(hash, &istate->name_hash)) { pos = insert_hash(hash, ce, &istate->name_hash);
pos = insert_hash(hash, ce, &istate->name_hash); if (pos) {
if (pos) { ce->dir_next = *pos;
ce->next = *pos; *pos = ce;
*pos = ce;
}
} }
} }
} }
@ -166,7 +164,10 @@ struct cache_entry *index_name_exists(struct index_state *istate, const char *na
if (same_name(ce, name, namelen, icase)) if (same_name(ce, name, namelen, icase))
return ce; return ce;
} }
ce = ce->next; if (icase && name[namelen - 1] == '/')
ce = ce->dir_next;
else
ce = ce->next;
} }
/* /*