refs: make peel_ref() virtual

For now it only supports the main reference store.

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 312c76619f75846aa1c4c363430a3ff929bf3ac3..3130c0e019350966df84a175c7de2e8a2b53d314 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -1428,6 +1428,13 @@ int pack_refs(unsigned int flags)
        return refs->be->pack_refs(refs, flags);
 }
 
+int peel_ref(const char *refname, unsigned char *sha1)
+{
+       struct ref_store *refs = get_ref_store(NULL);
+
+       return refs->be->peel_ref(refs, refname, sha1);
+}
+
 int create_symref(const char *ref_target, const char *refs_heads_master,
                  const char *logmsg)
 {

diff --git a/refs/files-backend.c b/refs/files-backend.c
index fc67cc6ec74725a28d212e525aea5a4ed64fc785..af3ad83fe59847623fe422f3123a67ec17b30843 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1759,9 +1759,10 @@ static enum peel_status peel_entry(struct ref_entry *entry, int repeel)
        return status;
 }
 
-int peel_ref(const char *refname, unsigned char *sha1)
+static int files_peel_ref(struct ref_store *ref_store,
+                         const char *refname, unsigned char *sha1)
 {
-       struct files_ref_store *refs = get_files_ref_store(NULL, "peel_ref");
+       struct files_ref_store *refs = files_downcast(ref_store, 0, "peel_ref");
        int flag;
        unsigned char base[20];
 
@@ -4027,6 +4028,7 @@ struct ref_storage_be refs_be_files = {
        files_transaction_commit,
 
        files_pack_refs,
+       files_peel_ref,
        files_create_symref,
 
        files_read_raw_ref,

diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index bf96503856e0440ec2a25f3fab1d212c47b2d949..84c81ad08e2c79a3cadcd2bbcfe43e21cbd1065a 100644 (file)
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -501,6 +501,8 @@ typedef int ref_transaction_commit_fn(struct ref_store *refs,
                                      struct strbuf *err);
 
 typedef int pack_refs_fn(struct ref_store *ref_store, unsigned int flags);
+typedef int peel_ref_fn(struct ref_store *ref_store,
+                       const char *refname, unsigned char *sha1);
 typedef int create_symref_fn(struct ref_store *ref_store,
                             const char *ref_target,
                             const char *refs_heads_master,
@@ -561,6 +563,7 @@ struct ref_storage_be {
        ref_transaction_commit_fn *transaction_commit;
 
        pack_refs_fn *pack_refs;
+       peel_ref_fn *peel_ref;
        create_symref_fn *create_symref;
 
        read_raw_ref_fn *read_raw_ref;