Skip to content

Commit

Permalink
find_symref(): 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 1700cb3 commit 7dabd05
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions upload-pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -741,8 +741,8 @@ static int send_ref(const char *refname, const unsigned char *sha1, int flag, vo
return 0;
}

static int find_symref(const char *refname, const unsigned char *sha1, int flag,
void *cb_data)
static int find_symref(const char *refname, const struct object_id *oid,
int flag, void *cb_data)
{
const char *symref_target;
struct string_list_item *item;
Expand All @@ -761,10 +761,8 @@ static int find_symref(const char *refname, const unsigned char *sha1, int flag,
static void upload_pack(void)
{
struct string_list symref = STRING_LIST_INIT_DUP;
struct each_ref_fn_sha1_adapter wrapped_find_symref =
{find_symref, &symref};

head_ref_namespaced(each_ref_fn_adapter, &wrapped_find_symref);
head_ref_namespaced(find_symref, &symref);

if (advertise_refs || !stateless_rpc) {
struct each_ref_fn_sha1_adapter wrapped_send_ref =
Expand Down

0 comments on commit 7dabd05

Please sign in to comment.