register_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:38 UTC
eed2514802569f292077214d1a04bccf91b250bd
1 file changed
+5
-8
bisect.c
+5
-8
@@ -400,16 +400,16 @@ struct commit_list *find_bisection(struct commit_list *list,
400
return best;
401
}
402
403
-static int register_ref(const char *refname, const unsigned char *sha1,
403
+static int register_ref(const char *refname, const struct object_id *oid,
404
int flags, void *cb_data)
405
{
406
if (!strcmp(refname, "bad")) {
407
current_bad_oid = xmalloc(sizeof(*current_bad_oid));
408
- hashcpy(current_bad_oid->hash, sha1);
408
+ oidcpy(current_bad_oid, oid);
409
} else if (starts_with(refname, "good-")) {
410
- sha1_array_append(&good_revs, sha1);
410
+ sha1_array_append(&good_revs, oid->hash);
411
} else if (starts_with(refname, "skip-")) {
412
- sha1_array_append(&skipped_revs, sha1);
412
+ sha1_array_append(&skipped_revs, oid->hash);
413
}
414
415
return 0;
@@ -417,10 +417,7 @@ static int register_ref(const char *refname, const unsigned char *sha1,
417
418
static int read_bisect_refs(void)
419
{
420
- struct each_ref_fn_sha1_adapter wrapped_register_ref =
421
- {register_ref, NULL};
422
-
423
- return for_each_ref_in("refs/bisect/", each_ref_fn_adapter, &wrapped_register_ref);
420
+ return for_each_ref_in("refs/bisect/", register_ref, NULL);
421
}
422
423
static void read_bisect_paths(struct argv_array *array)