kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

employ new explicit "exists in index?" API 

Each caller of index_name_exists() knows whether it is looking for a
directory or a file, and can avoid the unnecessary indirection of
index_name_exists() by instead calling index_dir_exists() or
index_file_exists() directly.

Invoking the appropriate search function explicitly will allow a
subsequent patch to relieve callers of the artificial burden of having
to add a trailing '/' to the pathname given to index_dir_exists().

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Eric Sunshine 2013-09-17 03:06:15 -04:00 committed by Junio C Hamano
parent db5360f3f4
commit ebbd7439b1
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dir.c
View File

@ -860,7 +860,7 @@ static struct dir_entry *dir_entry_new(const char *pathname, int len)


static struct dir_entry *dir_add_name(struct dir_struct *dir, const char *pathname, int len) static struct dir_entry *dir_add_name(struct dir_struct *dir, const char *pathname, int len)
{ {
if (cache_name_exists(pathname, len, ignore_case)) if (cache_file_exists(pathname, len, ignore_case))
return NULL; return NULL;


ALLOC_GROW(dir->entries, dir->nr+1, dir->alloc); ALLOC_GROW(dir->entries, dir->nr+1, dir->alloc);
@ -885,11 +885,11 @@ enum exist_status {
/* /*
* Do not use the alphabetically sorted 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. * directory 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)
{ {
const struct cache_entry *ce = cache_name_exists(dirname, len + 1, ignore_case); const struct cache_entry *ce = cache_dir_exists(dirname, len + 1);
unsigned char endchar; unsigned char endchar;


if (!ce) if (!ce)
@ -1071,7 +1071,7 @@ static int get_index_dtype(const char *path, int len)
int pos; int pos;
const struct cache_entry *ce; const struct cache_entry *ce;


ce = cache_name_exists(path, len, 0); ce = cache_file_exists(path, len, 0);
if (ce) { if (ce) {
if (!ce_uptodate(ce)) if (!ce_uptodate(ce))
return DT_UNKNOWN; return DT_UNKNOWN;
@ -1131,7 +1131,7 @@ static enum path_treatment treat_one_path(struct dir_struct *dir,
int dtype, struct dirent *de) int dtype, struct dirent *de)
{ {
int exclude; int exclude;
int has_path_in_index = !!cache_name_exists(path->buf, path->len, ignore_case); int has_path_in_index = !!cache_file_exists(path->buf, path->len, ignore_case);


if (dtype == DT_UNKNOWN) if (dtype == DT_UNKNOWN)
dtype = get_dtype(de, path->buf, path->len); dtype = get_dtype(de, path->buf, path->len);

4
read-cache.c
View File

@ -643,7 +643,7 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st,
if (*ptr == '/') { if (*ptr == '/') {
struct cache_entry *foundce; struct cache_entry *foundce;
++ptr; ++ptr;
foundce = index_name_exists(istate, ce->name, ptr - ce->name, ignore_case); foundce = index_dir_exists(istate, ce->name, ptr - ce->name);
if (foundce) { if (foundce) {
memcpy((void *)startPtr, foundce->name + (startPtr - ce->name), ptr - startPtr); memcpy((void *)startPtr, foundce->name + (startPtr - ce->name), ptr - startPtr);
startPtr = ptr; startPtr = ptr;
@ -652,7 +652,7 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st,
} }
} }


alias = index_name_exists(istate, ce->name, ce_namelen(ce), ignore_case); alias = index_file_exists(istate, ce->name, ce_namelen(ce), ignore_case);
if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) { if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) {
/* Nothing changed, really */ /* Nothing changed, really */
free(ce); free(ce);

4
unpack-trees.c
View File

@ -1357,7 +1357,7 @@ static int icase_exists(struct unpack_trees_options *o, const char *name, int le
{ {
const struct cache_entry *src; const struct cache_entry *src;


src = index_name_exists(o->src_index, name, len, 1); src = index_file_exists(o->src_index, name, len, 1);
return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE); return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
} }


@ -1403,7 +1403,7 @@ static int check_ok_to_remove(const char *name, int len, int dtype,
* delete this path, which is in a subdirectory that * delete this path, which is in a subdirectory that
* is being replaced with a blob. * is being replaced with a blob.
*/ */
result = index_name_exists(&o->result, name, len, 0); result = index_file_exists(&o->result, name, len, 0);
if (result) { if (result) {
if (result->ce_flags & CE_REMOVE) if (result->ce_flags & CE_REMOVE)
return 0; return 0;