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>
Michael Haggerty committed
May 25, 2015 at 18:39 UTC
a89caf4bd41eff7e144831d48f0ed18a1e4e7630
1 file changed
+3
-4
revision.c
+3
-4
@@ -1293,7 +1293,8 @@ static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
1293
return 0;
1294
}
1295
1296
-static int handle_one_reflog(const char *path, const unsigned char *sha1, int flag, void *cb_data)
1296
+static int handle_one_reflog(const char *path, const struct object_id *oid,
1297
+ int flag, void *cb_data)
1298
{
1299
struct all_refs_cb *cb = cb_data;
1300
cb->warned_bad_reflog = 0;
@@ -1305,12 +1306,10 @@ static int handle_one_reflog(const char *path, const unsigned char *sha1, int fl
1306
void add_reflogs_to_pending(struct rev_info *revs, unsigned flags)
1307
{
1308
struct all_refs_cb cb;
1308
- struct each_ref_fn_sha1_adapter wrapped_handle_one_reflog =
1309
- {handle_one_reflog, &cb};
1309
1310
cb.all_revs = revs;
1311
cb.all_flags = flags;
1313
- for_each_reflog(each_ref_fn_adapter, &wrapped_handle_one_reflog);
1312
+ for_each_reflog(handle_one_reflog, &cb);
1313
}
1314
1315
static void add_cache_tree(struct cache_tree *it, struct rev_info *revs,