kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

get_ref_dir(): change signature 

Change get_ref_dir() to take a (struct ref_cache *) in place of the
submodule name.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Michael Haggerty 2011-12-12 06:38:17 +01:00 committed by Junio C Hamano
parent 316b097ac1
commit 3b12482358
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
refs.c
View File

@ -298,14 +298,14 @@ static struct ref_array *get_packed_refs(struct ref_cache *refs)
return &refs->packed; return &refs->packed;
} }


static void get_ref_dir(const char *submodule, const char *base, static void get_ref_dir(struct ref_cache *refs, const char *base,
struct ref_array *array) struct ref_array *array)
{ {
DIR *dir; DIR *dir;
const char *path; const char *path;


if (*submodule) if (*refs->name)
path = git_path_submodule(submodule, "%s", base); path = git_path_submodule(refs->name, "%s", base);
else else
path = git_path("%s", base); path = git_path("%s", base);


@ -336,19 +336,19 @@ static void get_ref_dir(const char *submodule, const char *base,
if (has_extension(de->d_name, ".lock")) if (has_extension(de->d_name, ".lock"))
continue; continue;
memcpy(refname + baselen, de->d_name, namelen+1); memcpy(refname + baselen, de->d_name, namelen+1);
refdir = submodule refdir = *refs->name
? git_path_submodule(submodule, "%s", refname) ? git_path_submodule(refs->name, "%s", refname)
: git_path("%s", refname); : git_path("%s", refname);
if (stat(refdir, &st) < 0) if (stat(refdir, &st) < 0)
continue; continue;
if (S_ISDIR(st.st_mode)) { if (S_ISDIR(st.st_mode)) {
get_ref_dir(submodule, refname, array); get_ref_dir(refs, refname, array);
continue; continue;
} }
if (submodule) { if (*refs->name) {
hashclr(sha1); hashclr(sha1);
flag = 0; flag = 0;
if (resolve_gitlink_ref(submodule, refname, sha1) < 0) { if (resolve_gitlink_ref(refs->name, refname, sha1) < 0) {
hashclr(sha1); hashclr(sha1);
flag |= REF_ISBROKEN; flag |= REF_ISBROKEN;
} }
@ -400,7 +400,7 @@ void warn_dangling_symref(FILE *fp, const char *msg_fmt, const char *refname)
static struct ref_array *get_loose_refs(struct ref_cache *refs) static struct ref_array *get_loose_refs(struct ref_cache *refs)
{ {
if (!refs->did_loose) { if (!refs->did_loose) {
get_ref_dir(refs->name, "refs", &refs->loose); get_ref_dir(refs, "refs", &refs->loose);
sort_ref_array(&refs->loose); sort_ref_array(&refs->loose);
refs->did_loose = 1; refs->did_loose = 1;
} }