From: mhagger@alum.mit.edu Date: Mon, 12 Dec 2011 05:38:54 GMT Subject: [PATCH v2 47/51] read_loose_refs(): take a (ref_entry *) as argument Message-ID: <1323668338-1764-48-git-send-email-mhagger@alum.mit.edu> In-Reply-To: <1323668338-1764-1-git-send-email-mhagger@alum.mit.edu> From: Michael Haggerty Rename get_ref_dir() to read_loose_refs(), and change its signature. This is another step towards reading loose references one directory at a time. Signed-off-by: Michael Haggerty --- refs.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/refs.c b/refs.c index 4088167..a85a8a5 100644 --- a/refs.c +++ b/refs.c @@ -770,21 +770,20 @@ static struct ref_entry *get_packed_refs(struct ref_cache *refs) } /* - * dirname must match the name associated with dir; in particular, it - * must end with '/'. + * Fill direntry with loose references read from the filesystem. */ -static void get_ref_dir(struct ref_cache *refs, const char *dirname) +static void read_loose_refs(struct ref_entry *direntry) { DIR *d; char *path; + char *dirname = direntry->name; int dirnamelen = strlen(dirname); int pathlen; - struct ref_entry *direntry; - - assert(dirnamelen && dirname[dirnamelen - 1] == '/'); - - direntry = find_containing_direntry(refs->loose, dirname, 1); + struct ref_cache *refs; + assert(direntry->flag & REF_DIR); + assert(dirnamelen && direntry->name[dirnamelen - 1] == '/'); + refs = direntry->u.subdir.ref_cache; if (*refs->name) path = git_path_submodule(refs->name, "%s", dirname); else @@ -822,7 +821,9 @@ static void get_ref_dir(struct ref_cache *refs, const char *dirname) if (S_ISDIR(st.st_mode)) { refname[dirnamelen + namelen] = '/'; refname[dirnamelen + namelen + 1] = '\0'; - get_ref_dir(refs, refname); + read_loose_refs(find_containing_direntry( + refs->loose, + refname, 1)); continue; } if (*refs->name) { @@ -847,7 +848,7 @@ static struct ref_entry *get_loose_refs(struct ref_cache *refs) { if (!refs->loose) { refs->loose = create_dir_entry(refs, ""); - get_ref_dir(refs, "refs/"); + read_loose_refs(find_containing_direntry(refs->loose, "refs/", 1)); } return refs->loose; } -- 1.7.8