Skip to content

Commit

Permalink
append_similar_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
Michael Haggerty authored and Junio C Hamano committed May 25, 2015
1 parent 6c4461e commit 91d6e94
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions help.c
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ struct similar_ref_cb {
struct string_list *similar_refs;
};

static int append_similar_ref(const char *refname, const unsigned char *sha1,
static int append_similar_ref(const char *refname, const struct object_id *oid,
int flags, void *cb_data)
{
struct similar_ref_cb *cb = (struct similar_ref_cb *)(cb_data);
Expand All @@ -425,12 +425,10 @@ static struct string_list guess_refs(const char *ref)
{
struct similar_ref_cb ref_cb;
struct string_list similar_refs = STRING_LIST_INIT_NODUP;
struct each_ref_fn_sha1_adapter wrapped_append_similar_ref =
{append_similar_ref, &ref_cb};

ref_cb.base_ref = ref;
ref_cb.similar_refs = &similar_refs;
for_each_ref(each_ref_fn_adapter, &wrapped_append_similar_ref);
for_each_ref(append_similar_ref, &ref_cb);
return similar_refs;
}

Expand Down

0 comments on commit 91d6e94

Please sign in to comment.