read_loose_refs(): read refs using resolve_ref_recursively()

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>

diff --git a/refs.c b/refs.c
index 05af56b50a7d6ad953ba97b25e0b3a351148ea67..4f845798bad0fd1fc348d49592fb83e86679f09d 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -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 *refname,
-                                          int resolve_flags,
-                                          unsigned char *sha1, int *flags)
+const char *resolve_ref_recursively(struct ref_store *refs,
+                                   const char *refname,
+                                   int resolve_flags,
+                                   unsigned char *sha1, int *flags)

 {
        static struct strbuf sb_refname = STRBUF_INIT;
        int unused_flags;
 {
        static struct strbuf sb_refname = STRBUF_INIT;
        int unused_flags;

diff --git a/refs/files-backend.c b/refs/files-backend.c
index 4fe92f063731c777aa6d5714fb921a61924f7193..cdb6b8ff572a41d8a10cbc7a49bfa64dffe045ee 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1267,20 +1267,10 @@ static void read_loose_refs(const char *dirname, struct ref_dir *dir)
                                         create_dir_entry(refs, refname.buf,
                                                          refname.len, 1));
                } else {
                                         create_dir_entry(refs, refname.buf,
                                                          refname.len, 1));
                } else {

-                       int read_ok;
-
-                       if (refs->submodule) {
-                               hashclr(sha1);
-                               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) {
+                       if (!resolve_ref_recursively(&refs->base,
+                                                    refname.buf,
+                                                    RESOLVE_REF_READING,
+                                                    sha1, &flag)) {

                                hashclr(sha1);
                                flag |= REF_ISBROKEN;
                        } else if (is_null_sha1(sha1)) {
                                hashclr(sha1);
                                flag |= REF_ISBROKEN;
                        } else if (is_null_sha1(sha1)) {

diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 793c850e98fd0a2e2250b36a8efecf4293560245..33adbf93b564ce33ecfb2cdde92c02c9393dcb48 100644 (file)
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -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 */