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>
Michael Haggerty committed
May 25, 2015 at 18:39 UTC
00530834fb17f0ec070018270d0fb3e97e5dba07
1 file changed
+3
-5
replace_object.c
+3
-5
@@ -53,7 +53,7 @@ static int register_replace_object(struct replace_object *replace,
53
}
54
55
static int register_replace_ref(const char *refname,
56
- const unsigned char *sha1,
56
+ const struct object_id *oid,
57
int flag, void *cb_data)
58
{
59
/* Get sha1 from refname */
@@ -68,7 +68,7 @@ static int register_replace_ref(const char *refname,
68
}
69
70
/* Copy sha1 from the read ref */
71
- hashcpy(repl_obj->replacement, sha1);
71
+ hashcpy(repl_obj->replacement, oid->hash);
72
73
/* Register new object */
74
if (register_replace_object(repl_obj, 1))
@@ -80,13 +80,11 @@ static int register_replace_ref(const char *refname,
80
static void prepare_replace_object(void)
81
{
82
static int replace_object_prepared;
83
- struct each_ref_fn_sha1_adapter wrapped_register_replace_ref =
84
- {register_replace_ref, NULL};
83
84
if (replace_object_prepared)
85
return;
86
89
- for_each_replace_ref(each_ref_fn_adapter, &wrapped_register_replace_ref);
87
+ for_each_replace_ref(register_replace_ref, NULL);
88
replace_object_prepared = 1;
89
if (!replace_object_nr)
90
check_replace_refs = 0;