refs/files: stop using `the_repository` in `parse_loose_ref_contents()`

We implicitly rely on `the_repository` in `parse_loose_ref_contents()`
by calling `parse_oid_hex()`. Convert the function to instead use
`parse_oid_hex_algop()` and have callers pass in the hash algorithm to
use.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/refs.c b/refs.c
index 94a41934d6434feb8fffbb058d02857a6cc8c290..e082fc59b0ef323ec5116d85db1a4452d8efa1f2 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -1752,8 +1752,8 @@ static int refs_read_special_head(struct ref_store *ref_store,
                goto done;
        }
 
-       result = parse_loose_ref_contents(content.buf, oid, referent, type,
-                                         failure_errno);
+       result = parse_loose_ref_contents(ref_store->repo->hash_algo, content.buf,
+                                         oid, referent, type, failure_errno);
 
 done:
        strbuf_release(&full_path);

diff --git a/refs/files-backend.c b/refs/files-backend.c
index aa52d9be7c77ade85967f019cf94121e7903ef20..3437c79699f806111acb4211e633b932dea4db7f 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -552,7 +552,8 @@ stat_ref:
        strbuf_rtrim(&sb_contents);
        buf = sb_contents.buf;
 
-       ret = parse_loose_ref_contents(buf, oid, referent, type, &myerr);
+       ret = parse_loose_ref_contents(ref_store->repo->hash_algo, buf,
+                                      oid, referent, type, &myerr);
 
 out:
        if (ret && !myerr)
@@ -586,7 +587,8 @@ static int files_read_symbolic_ref(struct ref_store *ref_store, const char *refn
        return !(type & REF_ISSYMREF);
 }
 
-int parse_loose_ref_contents(const char *buf, struct object_id *oid,
+int parse_loose_ref_contents(const struct git_hash_algo *algop,
+                            const char *buf, struct object_id *oid,
                             struct strbuf *referent, unsigned int *type,
                             int *failure_errno)
 {
@@ -604,7 +606,7 @@ int parse_loose_ref_contents(const char *buf, struct object_id *oid,
        /*
         * FETCH_HEAD has additional data after the sha.
         */
-       if (parse_oid_hex(buf, oid, &p) ||
+       if (parse_oid_hex_algop(buf, oid, &p, algop) ||
            (*p != '\0' && !isspace(*p))) {
                *type |= REF_ISBROKEN;
                *failure_errno = EINVAL;
@@ -1998,7 +2000,8 @@ static int files_delete_reflog(struct ref_store *ref_store,
        return ret;
 }
 
-static int show_one_reflog_ent(struct strbuf *sb, each_reflog_ent_fn fn, void *cb_data)
+static int show_one_reflog_ent(struct files_ref_store *refs, struct strbuf *sb,
+                              each_reflog_ent_fn fn, void *cb_data)
 {
        struct object_id ooid, noid;
        char *email_end, *message;
@@ -2008,8 +2011,8 @@ static int show_one_reflog_ent(struct strbuf *sb, each_reflog_ent_fn fn, void *c
 
        /* old SP new SP name <email> SP time TAB msg LF */
        if (!sb->len || sb->buf[sb->len - 1] != '\n' ||
-           parse_oid_hex(p, &ooid, &p) || *p++ != ' ' ||
-           parse_oid_hex(p, &noid, &p) || *p++ != ' ' ||
+           parse_oid_hex_algop(p, &ooid, &p, refs->base.repo->hash_algo) || *p++ != ' ' ||
+           parse_oid_hex_algop(p, &noid, &p, refs->base.repo->hash_algo) || *p++ != ' ' ||
            !(email_end = strchr(p, '>')) ||
            email_end[1] != ' ' ||
            !(timestamp = parse_timestamp(email_end + 2, &message, 10)) ||
@@ -2108,7 +2111,7 @@ static int files_for_each_reflog_ent_reverse(struct ref_store *ref_store,
                                strbuf_splice(&sb, 0, 0, bp + 1, endp - (bp + 1));
                                scanp = bp;
                                endp = bp + 1;
-                               ret = show_one_reflog_ent(&sb, fn, cb_data);
+                               ret = show_one_reflog_ent(refs, &sb, fn, cb_data);
                                strbuf_reset(&sb);
                                if (ret)
                                        break;
@@ -2120,7 +2123,7 @@ static int files_for_each_reflog_ent_reverse(struct ref_store *ref_store,
                                 * Process it, and we can end the loop.
                                 */
                                strbuf_splice(&sb, 0, 0, buf, endp - buf);
-                               ret = show_one_reflog_ent(&sb, fn, cb_data);
+                               ret = show_one_reflog_ent(refs, &sb, fn, cb_data);
                                strbuf_reset(&sb);
                                break;
                        }
@@ -2170,7 +2173,7 @@ static int files_for_each_reflog_ent(struct ref_store *ref_store,
                return -1;
 
        while (!ret && !strbuf_getwholeline(&sb, logfp, '\n'))
-               ret = show_one_reflog_ent(&sb, fn, cb_data);
+               ret = show_one_reflog_ent(refs, &sb, fn, cb_data);
        fclose(logfp);
        strbuf_release(&sb);
        return ret;

diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index fa975d69aaabad05ad5aff620f8151039da23937..309b382284d969b98cb9003f16b024ed40f5988f 100644 (file)
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -705,7 +705,8 @@ struct ref_store {
  * Parse contents of a loose ref file. *failure_errno maybe be set to EINVAL for
  * invalid contents.
  */
-int parse_loose_ref_contents(const char *buf, struct object_id *oid,
+int parse_loose_ref_contents(const struct git_hash_algo *algop,
+                            const char *buf, struct object_id *oid,
                             struct strbuf *referent, unsigned int *type,
                             int *failure_errno);