summaryrefslogtreecommitdiff
path: root/upload-pack.c
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2015-05-25 18:39:10 +0000
committerJunio C Hamano <gitster@pobox.com>2015-05-25 12:19:37 -0700
commit7dabd05634154687f99b41c917a0d119e530814e (patch)
tree77299c86392784c5f48fd62ffc0e8f917cca420f /upload-pack.c
parent1700cb3b057c6d7703f2452b22f0171630988d5f (diff)
downloadgit-7dabd05634154687f99b41c917a0d119e530814e.tar.gz
find_symref(): 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 'upload-pack.c')
-rw-r--r--upload-pack.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/upload-pack.c b/upload-pack.c
index 52fab239ac..96dbedc710 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -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;
@@ -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 =