undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

read_loose_refs(): read refs using resolve_ref_recursively()

Browse Source 
There is no need to call read_ref_full() or resolve_gitlink_ref() from
read_loose_refs(), because we already have a ref_store object in hand.
So we can call resolve_ref_recursively() ourselves. Happily, this
unifies the code for the submodule vs. non-submodule cases.

This requires resolve_ref_recursively() to be exposed to the refs
subsystem, though not to non-refs code.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2017-02-09 21:53:52 +01:00 committed by Junio C Hamano
parent 9c7d772b6b
commit 3c0cb0cbae
3 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
refs.c
View File

@ -1230,10 +1230,10 @@ int for_each_rawref(each_ref_fn fn, void *cb_data)
} }
/* This function needs to return a meaningful errno on failure */ /* This function needs to return a meaningful errno on failure */
static const char *resolve_ref_recursively(struct ref_store *refs, const char *resolve_ref_recursively(struct ref_store *refs,
const char *refname, const char *refname,
int resolve_flags, int resolve_flags,
unsigned char *sha1, int *flags) unsigned char *sha1, int *flags)
{ {
static struct strbuf sb_refname = STRBUF_INIT; static struct strbuf sb_refname = STRBUF_INIT;
int unused_flags; int unused_flags;

18
refs/files-backend.c
View File

@ -1267,20 +1267,10 @@ static void read_loose_refs(const char *dirname, struct ref_dir *dir)
create_dir_entry(refs, refname.buf, create_dir_entry(refs, refname.buf,
refname.len, 1)); refname.len, 1));
} else { } else {
int read_ok; if (!resolve_ref_recursively(&refs->base,
refname.buf,
if (refs->submodule) { RESOLVE_REF_READING,
hashclr(sha1); sha1, &flag)) {
flag = 0;
read_ok = !resolve_gitlink_ref(refs->submodule,
refname.buf, sha1);
} else {
read_ok = !read_ref_full(refname.buf,
RESOLVE_REF_READING,
sha1, &flag);
}
if (!read_ok) {
hashclr(sha1); hashclr(sha1);
flag |= REF_ISBROKEN; flag |= REF_ISBROKEN;
} else if (is_null_sha1(sha1)) { } else if (is_null_sha1(sha1)) {

5
refs/refs-internal.h
View File

@ -650,4 +650,9 @@ void base_ref_store_init(struct ref_store *refs,
*/ */
struct ref_store *get_ref_store(const char *submodule); struct ref_store *get_ref_store(const char *submodule);
const char *resolve_ref_recursively(struct ref_store *refs,
const char *refname,
int resolve_flags,
unsigned char *sha1, int *flags);
#endif /* REFS_REFS_INTERNAL_H */ #endif /* REFS_REFS_INTERNAL_H */