mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-27 12:03:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs: wrap top-level ref_dirs in ref_entries

Browse Source 
Make it turtles all the way down.  This affects the loose and packed
fields of ref_cache instances.

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 2012-04-27 00:27:01 +02:00 committed by Junio C Hamano
parent 5fa0441844
commit d12229f532
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
refs.c
View File

@ -607,26 +607,26 @@ static int is_refname_available(const char *refname, const char *oldrefname,
*/
static struct ref_cache {
struct ref_cache *next;
char did_loose;
char did_packed;
struct ref_dir loose;
struct ref_dir packed;
struct ref_entry *loose;
struct ref_entry *packed;
/* The submodule name, or "" for the main repo. */
char name[FLEX_ARRAY];
} *ref_cache;
static void clear_packed_ref_cache(struct ref_cache *refs)
{
if (refs->did_packed)
clear_ref_dir(&refs->packed);
refs->did_packed = 0;
if (refs->packed) {
free_ref_entry(refs->packed);
refs->packed = NULL;
}
}
static void clear_loose_ref_cache(struct ref_cache *refs)
{
if (refs->did_loose)
clear_ref_dir(&refs->loose);
refs->did_loose = 0;
if (refs->loose) {
free_ref_entry(refs->loose);
refs->loose = NULL;
}
}
static struct ref_cache *create_ref_cache(const char *submodule)
@ -740,22 +740,22 @@ static void read_packed_refs(FILE *f, struct ref_dir *dir)
static struct ref_dir *get_packed_refs(struct ref_cache *refs)
{
if (!refs->did_packed) {
if (!refs->packed) {
const char *packed_refs_file;
FILE *f;
refs->packed = create_dir_entry("");
if (*refs->name)
packed_refs_file = git_path_submodule(refs->name, "packed-refs");
else
packed_refs_file = git_path("packed-refs");
f = fopen(packed_refs_file, "r");
if (f) {
read_packed_refs(f, &refs->packed);
read_packed_refs(f, &refs->packed->u.subdir);
fclose(f);
}
refs->did_packed = 1;
}
return &refs->packed;
return &refs->packed->u.subdir;
}
void add_packed_ref(const char *refname, const unsigned char *sha1)
@ -833,12 +833,13 @@ static void get_ref_dir(struct ref_cache *refs, const char *dirname,
static struct ref_dir *get_loose_refs(struct ref_cache *refs)
{
if (!refs->did_loose) {
if (!refs->loose) {
refs->loose = create_dir_entry("");
get_ref_dir(refs, "refs/",
&search_for_subdir(&refs->loose, "refs/", 1)->u.subdir);
refs->did_loose = 1;
&search_for_subdir(&refs->loose->u.subdir,
"refs/", 1)->u.subdir);
}
return &refs->loose;
return &refs->loose->u.subdir;
}
/* We allow "recursive" symbolic refs. Only within reason, though */