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

Access reference caches only through new function get_cached_refs()

Browse Source 
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2011-08-13 00:36:25 +02:00 committed by Junio C Hamano
parent f130b1168e
commit 4349a66805
1 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
refs.c
View File

@ -181,9 +181,26 @@ static void clear_cached_refs(struct cached_refs *ca)
ca->did_loose = ca->did_packed = 0; ca->did_loose = ca->did_packed = 0;
} }
/*
* Return a pointer to a cached_refs for the specified submodule. For
* the main repository, use submodule==NULL. The returned structure
* will be allocated and initialized but not necessarily populated; it
* should not be freed.
*/
static struct cached_refs *get_cached_refs(const char *submodule)
{
if (!submodule)
return &cached_refs;
else {
/* For now, don't reuse the refs cache for submodules. */
clear_cached_refs(&submodule_refs);
return &submodule_refs;
}
}
static void invalidate_cached_refs(void) static void invalidate_cached_refs(void)
{ {
clear_cached_refs(&cached_refs); clear_cached_refs(get_cached_refs(NULL));
} }
static void read_packed_refs(FILE *f, struct cached_refs *cached_refs) static void read_packed_refs(FILE *f, struct cached_refs *cached_refs)
@ -234,20 +251,17 @@ void clear_extra_refs(void)
static struct ref_list *get_packed_refs(const char *submodule) static struct ref_list *get_packed_refs(const char *submodule)
{ {
const char *packed_refs_file; struct cached_refs *refs = get_cached_refs(submodule);
struct cached_refs *refs;
if (submodule) { if (!refs->did_packed) {
packed_refs_file = git_path_submodule(submodule, "packed-refs"); const char *packed_refs_file;
refs = &submodule_refs; FILE *f;
free_ref_list(refs->packed);
} else {
packed_refs_file = git_path("packed-refs");
refs = &cached_refs;
}
if (!refs->did_packed || submodule) { if (submodule)
FILE *f = fopen(packed_refs_file, "r"); packed_refs_file = git_path_submodule(submodule, "packed-refs");
else
packed_refs_file = git_path("packed-refs");
f = fopen(packed_refs_file, "r");
refs->packed = NULL; refs->packed = NULL;
if (f) { if (f) {
read_packed_refs(f, refs); read_packed_refs(f, refs);
@ -361,17 +375,13 @@ void warn_dangling_symref(FILE *fp, const char *msg_fmt, const char *refname)
static struct ref_list *get_loose_refs(const char *submodule) static struct ref_list *get_loose_refs(const char *submodule)
{ {
if (submodule) { struct cached_refs *refs = get_cached_refs(submodule);
free_ref_list(submodule_refs.loose);
submodule_refs.loose = get_ref_dir(submodule, "refs", NULL);
return submodule_refs.loose;
}
if (!cached_refs.did_loose) { if (!refs->did_loose) {
cached_refs.loose = get_ref_dir(NULL, "refs", NULL); refs->loose = get_ref_dir(submodule, "refs", NULL);
cached_refs.did_loose = 1; refs->did_loose = 1;
} }
return cached_refs.loose; return refs->loose;
} }
/* We allow "recursive" symbolic refs. Only within reason, though */ /* We allow "recursive" symbolic refs. Only within reason, though */