diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2015-05-25 18:39:02 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-25 12:19:35 -0700 |
| commit | 00530834fb17f0ec070018270d0fb3e97e5dba07 (patch) | |
| tree | 36c768c617ceaaa6828e2ce1d39b394a8cd9536c /replace_object.c | |
| parent | 455ade659823ab01e7c1c5ec91be65c622319b01 (diff) | |
| download | git-00530834fb17f0ec070018270d0fb3e97e5dba07.tar.gz git-00530834fb17f0ec070018270d0fb3e97e5dba07.tar.xz | |
register_replace_ref(): rewrite to take an object_id argument
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'replace_object.c')
| -rw-r--r-- | replace_object.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/replace_object.c b/replace_object.c index a8a2da944..f0b39f06d 100644 --- a/replace_object.c +++ b/replace_object.c @@ -53,7 +53,7 @@ static int register_replace_object(struct replace_object *replace, } static int register_replace_ref(const char *refname, - const unsigned char *sha1, + const struct object_id *oid, int flag, void *cb_data) { /* Get sha1 from refname */ @@ -68,7 +68,7 @@ static int register_replace_ref(const char *refname, } /* Copy sha1 from the read ref */ - hashcpy(repl_obj->replacement, sha1); + hashcpy(repl_obj->replacement, oid->hash); /* Register new object */ if (register_replace_object(repl_obj, 1)) @@ -80,13 +80,11 @@ static int register_replace_ref(const char *refname, static void prepare_replace_object(void) { static int replace_object_prepared; - struct each_ref_fn_sha1_adapter wrapped_register_replace_ref = - {register_replace_ref, NULL}; if (replace_object_prepared) return; - for_each_replace_ref(each_ref_fn_adapter, &wrapped_register_replace_ref); + for_each_replace_ref(register_replace_ref, NULL); replace_object_prepared = 1; if (!replace_object_nr) check_replace_refs = 0; |