From: mhagger@alum.mit.edu Date: Mon, 12 Dec 2011 05:38:46 GMT Subject: [PATCH v2 39/51] read_packed_refs(): take (ref_entry *) instead of (ref_dir *) Message-ID: <1323668338-1764-40-git-send-email-mhagger@alum.mit.edu> In-Reply-To: <1323668338-1764-1-git-send-email-mhagger@alum.mit.edu> From: Michael Haggerty Signed-off-by: Michael Haggerty --- refs.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/refs.c b/refs.c index df7416f..0d8fdf0 100644 --- a/refs.c +++ b/refs.c @@ -670,12 +670,13 @@ static const char *parse_ref_line(char *line, unsigned char *sha1) return line; } -static void read_packed_refs(FILE *f, struct ref_dir *dir) +static void read_packed_refs(FILE *f, struct ref_entry *direntry) { struct ref_entry *last = NULL; char refline[PATH_MAX]; int flag = REF_ISPACKED; + assert(direntry->flag & REF_DIR); while (fgets(refline, sizeof(refline), f)) { unsigned char sha1[20]; const char *refname; @@ -692,7 +693,7 @@ static void read_packed_refs(FILE *f, struct ref_dir *dir) refname = parse_ref_line(refline, sha1); if (refname) { last = create_ref_entry(refname, sha1, flag, 1); - add_ref(dir, last); + add_ref(&direntry->u.subdir, last); continue; } if (last && @@ -732,7 +733,7 @@ static struct ref_entry *get_packed_refs(struct ref_cache *refs) packed_refs_file = git_path("packed-refs"); f = fopen(packed_refs_file, "r"); if (f) { - read_packed_refs(f, &refs->packed->u.subdir); + read_packed_refs(f, refs->packed); fclose(f); } } -- 1.7.8