resolve_packed_ref(): rename function from resolve_missing_loose_ref()

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

diff --git a/refs/files-backend.c b/refs/files-backend.c
index 748e5cb07603e5d06f5141fac842d17a8844eb04..924bdda19339af484c8ed3f606d81814d95bd25a 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1329,10 +1329,9 @@ static struct ref_entry *get_packed_ref(struct files_ref_store *refs,
 /*
  * A loose ref file doesn't exist; check for a packed ref.
  */
 /*
  * A loose ref file doesn't exist; check for a packed ref.
  */

-static int resolve_missing_loose_ref(struct files_ref_store *refs,
-                                    const char *refname,
-                                    unsigned char *sha1,
-                                    unsigned int *flags)
+static int resolve_packed_ref(struct files_ref_store *refs,
+                             const char *refname,
+                             unsigned char *sha1, unsigned int *flags)

 {
        struct ref_entry *entry;
 
 {
        struct ref_entry *entry;
 


@@ -1383,7 +1382,7 @@ int read_raw_ref(const char *refname, unsigned char *sha1,
        if (lstat(path, &st) < 0) {
                if (errno != ENOENT)
                        goto out;
        if (lstat(path, &st) < 0) {
                if (errno != ENOENT)
                        goto out;

-               if (resolve_missing_loose_ref(refs, refname, sha1, type)) {
+               if (resolve_packed_ref(refs, refname, sha1, type)) {

                        errno = ENOENT;
                        goto out;
                }
                        errno = ENOENT;
                        goto out;
                }


@@ -1417,7 +1416,7 @@ int read_raw_ref(const char *refname, unsigned char *sha1,
                 * ref is supposed to be, there could still be a
                 * packed ref:
                 */
                 * ref is supposed to be, there could still be a
                 * packed ref:
                 */

-               if (resolve_missing_loose_ref(refs, refname, sha1, type)) {
+               if (resolve_packed_ref(refs, refname, sha1, type)) {

                        errno = EISDIR;
                        goto out;
                }
                        errno = EISDIR;
                        goto out;
                }