Convert remaining callers of resolve_gitlink_ref to object_id

diff --git a/refs/packed-backend.c b/refs/packed-backend.c
index 6e85b0bf0bd5efad7617698a4c2f740a9a28fb05..4ec9fcacdd752302c8c289e77b26774378c96477 100644 (file)
--- a/refs/packed-backend.c
+++ b/refs/packed-backend.c
@@ -1233,8 +1233,8 @@ static int write_with_updates(struct packed_ref_store *refs,
        }
 
        if (ok != ITER_DONE) {
-               strbuf_addf(err, "unable to write packed-refs file: "
-                           "error iterating over old contents");
+               strbuf_addstr(err, "unable to write packed-refs file: "
+                             "error iterating over old contents");
                goto error;
        }
 
@@ -1519,7 +1519,7 @@ static int packed_delete_reflog(struct ref_store *ref_store,
 }
 
 static int packed_reflog_expire(struct ref_store *ref_store,
-                               const char *refname, const unsigned char *sha1,
+                               const char *refname, const struct object_id *oid,
                                unsigned int flags,
                                reflog_expiry_prepare_fn prepare_fn,
                                reflog_expiry_should_prune_fn should_prune_fn,