resolve_ref_recursively(): new function

Add a new function, resolve_ref_recursively(), which is basically like
the old resolve_ref_unsafe() except that it takes a (ref_store *)
argument and also works for submodules.

Re-implement resolve_ref_unsafe() as a thin wrapper around
resolve_ref_recursively().

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/refs.c b/refs.c
index b3a775e640166d4c2a135c9d1f95838577731b18..464fe719287eff873cc7ecfbb91dbb0a1fe7292b 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -1216,13 +1216,14 @@ 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 */

-const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
-                              unsigned char *sha1, int *flags)
+static 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;
        int symref_count;
 {
        static struct strbuf sb_refname = STRBUF_INIT;
        int unused_flags;
        int symref_count;

-       struct ref_store *refs = get_ref_store(NULL);

 
        if (!flags)
                flags = &unused_flags;
 
        if (!flags)
                flags = &unused_flags;


@@ -1291,6 +1292,13 @@ const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
        return NULL;
 }
 
        return NULL;
 }
 

+const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
+                              unsigned char *sha1, int *flags)
+{
+       return resolve_ref_recursively(get_ref_store(NULL), refname,
+                                      resolve_flags, sha1, flags);
+}
+

 /* A pointer to the ref_store for the main repository: */
 static struct ref_store *main_ref_store;
 
 /* A pointer to the ref_store for the main repository: */
 static struct ref_store *main_ref_store;