[PATCH 12/14] get_ref_dir(): change signature
From: <hidden>
Date: 2016-06-15 22:52:14
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Michael Haggerty <redacted> Change get_ref_dir() to take a (struct cached_refs *) in place of the submodule name. Signed-off-by: Michael Haggerty <redacted> --- refs.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/refs.c b/refs.c
index 1109c9f..01b8efd 100644
--- a/refs.c
+++ b/refs.c@@ -300,14 +300,14 @@ static struct ref_array *get_packed_refs(struct cached_refs *refs) return &refs->packed; } -static void get_ref_dir(const char *submodule, const char *base, +static void get_ref_dir(struct cached_refs *refs, const char *base, struct ref_array *array) { DIR *dir; const char *path; - if (*submodule) - path = git_path_submodule(submodule, "%s", base); + if (*refs->name) + path = git_path_submodule(refs->name, "%s", base); else path = git_path("%s", base);
@@ -338,19 +338,19 @@ static void get_ref_dir(const char *submodule, const char *base, if (has_extension(de->d_name, ".lock")) continue; memcpy(ref + baselen, de->d_name, namelen+1); - refdir = submodule - ? git_path_submodule(submodule, "%s", ref) + refdir = *refs->name + ? git_path_submodule(refs->name, "%s", ref) : git_path("%s", ref); if (stat(refdir, &st) < 0) continue; if (S_ISDIR(st.st_mode)) { - get_ref_dir(submodule, ref, array); + get_ref_dir(refs, ref, array); continue; } - if (submodule) { + if (*refs->name) { hashclr(sha1); flag = 0; - if (resolve_gitlink_ref(submodule, ref, sha1) < 0) { + if (resolve_gitlink_ref(refs->name, ref, sha1) < 0) { hashclr(sha1); flag |= REF_BROKEN; }
@@ -403,7 +403,7 @@ void warn_dangling_symref(FILE *fp, const char *msg_fmt, const char *refname) static struct ref_array *get_loose_refs(struct cached_refs *refs) { if (!refs->did_loose) { - get_ref_dir(refs->name, "refs", &refs->loose); + get_ref_dir(refs, "refs", &refs->loose); sort_ref_array(&refs->loose); refs->did_loose = 1; }
--
1.7.7.rc2