Skip to content

Commit

Permalink
register_ref(): rewrite to take an object_id argument
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
mhagger authored and gitster committed May 25, 2015
1 parent a217dcb commit eed2514
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions bisect.c
Expand Up @@ -400,27 +400,24 @@ 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;
}

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)
Expand Down

0 comments on commit eed2514

Please sign in to comment.