From: Michael Haggerty Date: Thu, 26 Apr 2012 22:27:06 +0000 (+0200) Subject: read_loose_refs(): eliminate ref_cache argument X-Git-Tag: v1.7.11-rc0~49^2~2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=423a1afc0bc48bb5520d518b521ecf9d79f59bb3;p=git.git read_loose_refs(): eliminate ref_cache argument The ref_cache can now be read from the ref_dir. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- diff --git a/refs.c b/refs.c index 6720b9020..746661ecf 100644 --- a/refs.c +++ b/refs.c @@ -785,9 +785,9 @@ void add_packed_ref(const char *refname, const unsigned char *sha1) * dirname must end with '/'. dir must be the directory entry * corresponding to dirname. */ -static void read_loose_refs(struct ref_cache *refs, const char *dirname, - struct ref_dir *dir) +static void read_loose_refs(const char *dirname, struct ref_dir *dir) { + struct ref_cache *refs = dir->ref_cache; DIR *d; const char *path; struct dirent *de; @@ -824,7 +824,7 @@ static void read_loose_refs(struct ref_cache *refs, const char *dirname, ; /* silently ignore */ } else if (S_ISDIR(st.st_mode)) { strbuf_addch(&refname, '/'); - read_loose_refs(refs, refname.buf, + read_loose_refs(refname.buf, search_for_subdir(dir, refname.buf, 1)); } else { if (*refs->name) { @@ -851,7 +851,7 @@ static struct ref_dir *get_loose_refs(struct ref_cache *refs) { if (!refs->loose) { refs->loose = create_dir_entry(refs, ""); - read_loose_refs(refs, "refs/", + read_loose_refs("refs/", search_for_subdir(get_ref_dir(refs->loose), "refs/", 1)); }