From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Mon, 25 May 2015 18:39:03 +0000 (+0000)
Subject: handle_one_reflog(): rewrite to take an object_id argument
X-Git-Tag: v2.5.0-rc0~54^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a89caf4bd41eff7e144831d48f0ed18a1e4e7630;p=thirdparty%2Fgit.git

handle_one_reflog(): 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>
---

diff --git a/revision.c b/revision.c
index cfe3876ce8..1d903cf311 100644
--- a/revision.c
+++ b/revision.c
@@ -1293,7 +1293,8 @@ static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
 	return 0;
 }
 
-static int handle_one_reflog(const char *path, const unsigned char *sha1, int flag, void *cb_data)
+static int handle_one_reflog(const char *path, const struct object_id *oid,
+			     int flag, void *cb_data)
 {
 	struct all_refs_cb *cb = cb_data;
 	cb->warned_bad_reflog = 0;
@@ -1305,12 +1306,10 @@ static int handle_one_reflog(const char *path, const unsigned char *sha1, int fl
 void add_reflogs_to_pending(struct rev_info *revs, unsigned flags)
 {
 	struct all_refs_cb cb;
-	struct each_ref_fn_sha1_adapter wrapped_handle_one_reflog =
-		{handle_one_reflog, &cb};
 
 	cb.all_revs = revs;
 	cb.all_flags = flags;
-	for_each_reflog(each_ref_fn_adapter, &wrapped_handle_one_reflog);
+	for_each_reflog(handle_one_reflog, &cb);
 }
 
 static void add_cache_tree(struct cache_tree *it, struct rev_info *revs,