diff options
author | Michael Haggerty <mhagger@alum.mit.edu> | 2015-05-25 18:38:31 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-05-25 12:19:28 -0700 |
commit | eed2514802569f292077214d1a04bccf91b250bd (patch) | |
tree | 1df3145857b274da0aa351a31c6b3ad38b7065a8 /bisect.c | |
parent | a217dcbd1efb8d68baf3dc9765aa8789970527fd (diff) | |
download | git-eed2514802569f292077214d1a04bccf91b250bd.tar.gz git-eed2514802569f292077214d1a04bccf91b250bd.tar.xz |
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>
Diffstat (limited to 'bisect.c')
-rw-r--r-- | bisect.c | 13 |
1 files changed, 5 insertions, 8 deletions
@@ -400,16 +400,16 @@ struct commit_list *find_bisection(struct commit_list *list, return best; } -static int register_ref(const char *refname, const unsigned char *sha1, +static int register_ref(const char *refname, const struct object_id *oid, int flags, void *cb_data) { if (!strcmp(refname, "bad")) { current_bad_oid = xmalloc(sizeof(*current_bad_oid)); - hashcpy(current_bad_oid->hash, sha1); + oidcpy(current_bad_oid, oid); } else if (starts_with(refname, "good-")) { - sha1_array_append(&good_revs, sha1); + sha1_array_append(&good_revs, oid->hash); } else if (starts_with(refname, "skip-")) { - sha1_array_append(&skipped_revs, sha1); + sha1_array_append(&skipped_revs, oid->hash); } return 0; @@ -417,10 +417,7 @@ static int register_ref(const char *refname, const unsigned char *sha1, static int read_bisect_refs(void) { - struct each_ref_fn_sha1_adapter wrapped_register_ref = - {register_ref, NULL}; - - return for_each_ref_in("refs/bisect/", each_ref_fn_adapter, &wrapped_register_ref); + return for_each_ref_in("refs/bisect/", register_ref, NULL); } static void read_bisect_paths(struct argv_array *array) |