db5360f3f496 (name-hash: refactor polymorphic index_name_exists();
2013-09-17) split index_name_exists() into index_file_exists() and
index_dir_exists() but retained index_name_exists() as a thin wrapper
to avoid disturbing possible in-flight topics. Since this change
landed in 'master' some time ago and there are no in-flight topics
referencing index_name_exists(), retire it.

Signed-off-by: Eric Sunshine <sunsh...@sunshineco.com>

Perhaps now is a good time to retire this unused function?

This patch conflicts textually with kb/fast-hashmap in 'pu', although,
since both are merely removing functions from name-hash.c at the point
of conflict, the resolution should be straightforward.

 cache.h     | 2 --
 name-hash.c | 7 -------
 2 files changed, 9 deletions(-)

diff --git a/cache.h b/cache.h
index ce377e1..23f207a 100644
--- a/cache.h
+++ b/cache.h
@@ -316,7 +316,6 @@ extern void free_name_hash(struct index_state *istate);
 #define ce_modified(ce, st, options) ie_modified(&the_index, (ce), (st), 
 #define cache_dir_exists(name, namelen) index_dir_exists(&the_index, (name), 
 #define cache_file_exists(name, namelen, igncase) 
index_file_exists(&the_index, (name), (namelen), (igncase))
-#define cache_name_exists(name, namelen, igncase) 
index_name_exists(&the_index, (name), (namelen), (igncase))
 #define cache_name_is_other(name, namelen) index_name_is_other(&the_index, 
(name), (namelen))
 #define resolve_undo_clear() resolve_undo_clear_index(&the_index)
 #define unmerge_cache_entry_at(at) unmerge_index_entry_at(&the_index, at)
@@ -466,7 +465,6 @@ extern int unmerged_index(const struct index_state *);
 extern int verify_path(const char *path);
 extern struct cache_entry *index_dir_exists(struct index_state *istate, const 
char *name, int namelen);
 extern struct cache_entry *index_file_exists(struct index_state *istate, const 
char *name, int namelen, int igncase);
-extern struct cache_entry *index_name_exists(struct index_state *istate, const 
char *name, int namelen, int igncase);
 extern int index_name_pos(const struct index_state *, const char *name, int 
 #define ADD_CACHE_OK_TO_ADD 1          /* Ok to add */
 #define ADD_CACHE_OK_TO_REPLACE 2      /* Ok to replace file/directory */
diff --git a/name-hash.c b/name-hash.c
index e5b6e1a..715f95c 100644
--- a/name-hash.c
+++ b/name-hash.c
@@ -263,13 +263,6 @@ struct cache_entry *index_file_exists(struct index_state 
*istate, const char *na
        return NULL;
-struct cache_entry *index_name_exists(struct index_state *istate, const char 
*name, int namelen, int icase)
-       if (namelen > 0 && name[namelen - 1] == '/')
-               return index_dir_exists(istate, name, namelen - 1);
-       return index_file_exists(istate, name, namelen, icase);
 static int free_dir_entry(void *entry, void *unused)
        struct dir_entry *dir = entry;

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to