undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dir.c: use the cache_* macro to access the current index

Browse Source 
These codepaths always start from the_index and use index_*
functions, but there is no reason to do so.  Use the compatibility
cache_* macro to access the current in-core index like everybody
else.

While at it, fix typo in the comment for a function to check if a
path within a directory appears in the index.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2013-08-15 12:08:45 -07:00
parent edca415256
commit 7126102742
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dir.c
View File

@ -472,15 +472,14 @@ static void *read_skip_worktree_file_from_index(const char *path, size_t *size)
unsigned long sz; unsigned long sz;
enum object_type type; enum object_type type;
void *data; void *data;
struct index_state *istate = &the_index;
len = strlen(path); len = strlen(path);
pos = index_name_pos(istate, path, len); pos = cache_name_pos(path, len);
if (pos < 0) if (pos < 0)
return NULL; return NULL;
if (!ce_skip_worktree(istate->cache[pos])) if (!ce_skip_worktree(active_cache[pos]))
return NULL; return NULL;
data = read_sha1_file(istate->cache[pos]->sha1, &type, &sz); data = read_sha1_file(active_cache[pos]->sha1, &type, &sz);
if (!data || type != OBJ_BLOB) { if (!data || type != OBJ_BLOB) {
free(data); free(data);
return NULL; return NULL;
@ -924,13 +923,13 @@ enum exist_status {
}; };
/* /*
* Do not use the alphabetically stored index to look up * Do not use the alphabetically sorted index to look up
* the directory name; instead, use the case insensitive * the directory name; instead, use the case insensitive
* name hash. * name hash.
*/ */
static enum exist_status directory_exists_in_index_icase(const char *dirname, int len) static enum exist_status directory_exists_in_index_icase(const char *dirname, int len)
{ {
struct cache_entry *ce = index_name_exists(&the_index, dirname, len + 1, ignore_case); struct cache_entry *ce = cache_name_exists(dirname, len + 1, ignore_case);
unsigned char endchar; unsigned char endchar;
if (!ce) if (!ce)