summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Michael Haggerty <mhagger@alum.mit.edu>2015-05-25 18:39:16 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-05-25 12:19:38 -0700
commitf8ee4d85229a26ec6d4ce403d953eea6b53c6396 (patch)
tree6035045340827878ba9bd657cdb0a9cdb11d8aea
parentclear_marks(): rewrite to take an object_id argument (diff)
downloadtgif-f8ee4d85229a26ec6d4ce403d953eea6b53c6396.tar.xz
mark_complete_oid(): new function, taking an object_oid
This function can be used with for_each_ref() without having to be wrapped. 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>
-rw-r--r--fetch-pack.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/fetch-pack.c b/fetch-pack.c
index 1e875cf06d..d7a4a48681 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -490,6 +490,12 @@ static int mark_complete(const char *refname, const unsigned char *sha1, int fla
return 0;
}
+static int mark_complete_oid(const char *refname, const struct object_id *oid,
+ int flag, void *cb_data)
+{
+ return mark_complete(refname, oid->hash, flag, cb_data);
+}
+
static void mark_recent_complete_commits(struct fetch_pack_args *args,
unsigned long cutoff)
{
@@ -602,10 +608,7 @@ static int everything_local(struct fetch_pack_args *args,
}
if (!args->depth) {
- struct each_ref_fn_sha1_adapter wrapped_mark_complete =
- {mark_complete, NULL};
-
- for_each_ref(each_ref_fn_adapter, &wrapped_mark_complete);
+ for_each_ref(mark_complete_oid, NULL);
for_each_alternate_ref(mark_alternate_complete, NULL);
commit_list_sort_by_date(&complete);
if (cutoff)