Skip to content

Commit

Permalink
handle_one_reflog(): rewrite to take an object_id argument
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
mhagger authored and gitster committed May 25, 2015
1 parent 0053083 commit a89caf4
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions revision.c
Expand Up @@ -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;
Expand All @@ -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,
Expand Down

0 comments on commit a89caf4

Please sign in to comment.