From: Michael Haggerty <mhag...@alum.mit.edu>
Signed-off-by: Michael Haggerty <mhag...@alum.mit.edu>
Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net>
---
builtin/reflog.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/builtin/reflog.c b/builtin/reflog.c
index 1163dd6..c2eb8ff 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -313,14 +313,14 @@ static int should_expire_reflog_ent(unsigned char *osha1,
unsigned char *nsha1,
return 0;
}
-static int push_tip_to_list(const char *refname, const unsigned char *sha1,
+static int push_tip_to_list(const char *refname, const struct object_id *oid,
int flags, void *cb_data)
{
struct commit_list **list = cb_data;
struct commit *tip_commit;
if (flags & REF_ISSYMREF)
return 0;
- tip_commit = lookup_commit_reference_gently(sha1, 1);
+ tip_commit = lookup_commit_reference_gently(oid->hash, 1);
if (!tip_commit)
return 0;
commit_list_insert(tip_commit, list);
@@ -352,10 +352,8 @@ static void reflog_expiry_prepare(const char *refname,
if (cb->unreachable_expire_kind != UE_ALWAYS) {
if (cb->unreachable_expire_kind == UE_HEAD) {
struct commit_list *elem;
- struct each_ref_fn_sha1_adapter
wrapped_push_tip_to_list =
- {push_tip_to_list, &cb->tips};
- for_each_ref(each_ref_fn_adapter,
&wrapped_push_tip_to_list);
+ for_each_ref(push_tip_to_list, &cb->tips);
for (elem = cb->tips; elem; elem = elem->next)
commit_list_insert(elem->item, &cb->mark_list);
} else {
@@ -382,14 +380,14 @@ static void reflog_expiry_cleanup(void *cb_data)
}
}
-static int collect_reflog(const char *ref, const unsigned char *sha1, int
unused, void *cb_data)
+static int collect_reflog(const char *ref, const struct object_id *oid, int
unused, void *cb_data)
{
struct collected_reflog *e;
struct collect_reflog_cb *cb = cb_data;
size_t namelen = strlen(ref);
e = xmalloc(sizeof(*e) + namelen + 1);
- hashcpy(e->sha1, sha1);
+ hashcpy(e->sha1, oid->hash);
memcpy(e->reflog, ref, namelen + 1);
ALLOC_GROW(cb->e, cb->nr + 1, cb->alloc);
cb->e[cb->nr++] = e;
@@ -591,11 +589,9 @@ static int cmd_reflog_expire(int argc, const char **argv,
const char *prefix)
if (do_all) {
struct collect_reflog_cb collected;
int i;
- struct each_ref_fn_sha1_adapter wrapped_collect_reflog =
- {collect_reflog, &collected};
memset(&collected, 0, sizeof(collected));
- for_each_reflog(each_ref_fn_adapter, &wrapped_collect_reflog);
+ for_each_reflog(collect_reflog, &collected);
for (i = 0; i < collected.nr; i++) {
struct collected_reflog *e = collected.e[i];
set_reflog_expiry_param(&cb.cmd, explicit_expiry,
e->reflog);
--
2.4.0
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
