From 746593bdcaf86827e016c97e091442d6a227de0f Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Sat, 26 Oct 2013 19:03:01 +0200 Subject: [PATCH 1/2] refs: remove unused function invalidate_ref_cache The function 'invalidate_ref_cache' was introduced in 79c7ca5 (2011-10-17, invalidate_ref_cache(): rename function from invalidate_cached_refs()) by a rename and elevated to be publicly usable in 8be8bde (2011-10-17, invalidate_ref_cache(): expose this function in the refs API) However it is not used anymore, as 8bf90dc (2011-10-17, write_ref_sha1(): only invalidate the loose ref cache) and (much) later 506a760 (2013-04-22, refs: change how packed refs are deleted) removed any calls to this function. So it seems as if we don't need that function any more, good bye! Signed-off-by: Stefan Beller Acked-by: Michael Haggerty Signed-off-by: Junio C Hamano --- refs.c | 7 ------- refs.h | 8 -------- 2 files changed, 15 deletions(-) diff --git a/refs.c b/refs.c index 7922261580..d20834054b 100644 --- a/refs.c +++ b/refs.c @@ -943,13 +943,6 @@ static struct ref_cache *get_ref_cache(const char *submodule) return refs; } -void invalidate_ref_cache(const char *submodule) -{ - struct ref_cache *refs = get_ref_cache(submodule); - clear_packed_ref_cache(refs); - clear_loose_ref_cache(refs); -} - /* The length of a peeled reference line in packed-refs, including EOL: */ #define PEELED_LINE_LENGTH 42 diff --git a/refs.h b/refs.h index 9e5db3ae26..861170d691 100644 --- a/refs.h +++ b/refs.h @@ -151,14 +151,6 @@ extern void unlock_ref(struct ref_lock *lock); /** Writes sha1 into the ref specified by the lock. **/ extern int write_ref_sha1(struct ref_lock *lock, const unsigned char *sha1, const char *msg); -/* - * Invalidate the reference cache for the specified submodule. Use - * submodule=NULL to invalidate the cache for the main module. This - * function must be called if references are changed via a mechanism - * other than the refs API. - */ -extern void invalidate_ref_cache(const char *submodule); - /** Setup reflog before using. **/ int log_ref_setup(const char *ref_name, char *logfile, int bufsize); From 84471a12130a40a050ce502c49f1faba97651add Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Sat, 26 Oct 2013 19:03:02 +0200 Subject: [PATCH 2/2] cache: remove unused function 'have_git_dir' This function was added in d2b0708 (2008-09-27, add have_git_dir() function) as a preparation for adbc0b6 (2008-09-30, cygwin: Use native Win32 API for stat). However the second referenced commit was reverted in f66450a (2013-06-22, cygwin: Remove the Win32 l/stat() implementation), so we don't need to expose this wrapper function any more as a public API. Signed-off-by: Stefan Beller Acked-by: Michael Haggerty Signed-off-by: Junio C Hamano --- cache.h | 1 - environment.c | 5 ----- 2 files changed, 6 deletions(-) diff --git a/cache.h b/cache.h index 85b544f38d..9cda46e07b 100644 --- a/cache.h +++ b/cache.h @@ -391,7 +391,6 @@ extern int is_bare_repository(void); extern int is_inside_git_dir(void); extern char *git_work_tree_cfg; extern int is_inside_work_tree(void); -extern int have_git_dir(void); extern const char *get_git_dir(void); extern int is_git_directory(const char *path); extern char *get_object_directory(void); diff --git a/environment.c b/environment.c index 378254c77a..0a15349cfe 100644 --- a/environment.c +++ b/environment.c @@ -155,11 +155,6 @@ int is_bare_repository(void) return is_bare_repository_cfg && !get_git_work_tree(); } -int have_git_dir(void) -{ - return !!git_dir; -} - const char *get_git_dir(void) { if (!git_dir)