Merge branch 'sb/refs-code-cleanup'

* sb/refs-code-cleanup:
  cache: remove unused function 'have_git_dir'
  refs: remove unused function invalidate_ref_cache
This commit is contained in:
Junio C Hamano 2013-11-01 07:38:58 -07:00
commit e0fd1e3841
4 changed files with 0 additions and 21 deletions

View File

@ -398,7 +398,6 @@ extern int is_bare_repository(void);
extern int is_inside_git_dir(void); extern int is_inside_git_dir(void);
extern char *git_work_tree_cfg; extern char *git_work_tree_cfg;
extern int is_inside_work_tree(void); extern int is_inside_work_tree(void);
extern int have_git_dir(void);
extern const char *get_git_dir(void); extern const char *get_git_dir(void);
extern int is_git_directory(const char *path); extern int is_git_directory(const char *path);
extern char *get_object_directory(void); extern char *get_object_directory(void);

View File

@ -155,11 +155,6 @@ int is_bare_repository(void)
return is_bare_repository_cfg && !get_git_work_tree(); return is_bare_repository_cfg && !get_git_work_tree();
} }
int have_git_dir(void)
{
return !!git_dir;
}
const char *get_git_dir(void) const char *get_git_dir(void)
{ {
if (!git_dir) if (!git_dir)

7
refs.c
View File

@ -947,13 +947,6 @@ static struct ref_cache *get_ref_cache(const char *submodule)
return refs; 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: */ /* The length of a peeled reference line in packed-refs, including EOL: */
#define PEELED_LINE_LENGTH 42 #define PEELED_LINE_LENGTH 42

8
refs.h
View File

@ -165,14 +165,6 @@ extern void unlock_ref(struct ref_lock *lock);
/** Writes sha1 into the ref specified by the 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); 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. **/ /** Setup reflog before using. **/
int log_ref_setup(const char *ref_name, char *logfile, int bufsize); int log_ref_setup(const char *ref_name, char *logfile, int bufsize);