diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2015-05-25 18:39:03 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-25 12:19:35 -0700 |
| commit | a89caf4bd41eff7e144831d48f0ed18a1e4e7630 (patch) | |
| tree | 13a49ea280c51464c898bdff1c5219cecb068828 /revision.c | |
| parent | 00530834fb17f0ec070018270d0fb3e97e5dba07 (diff) | |
| download | git-a89caf4bd41eff7e144831d48f0ed18a1e4e7630.tar.gz git-a89caf4bd41eff7e144831d48f0ed18a1e4e7630.tar.xz | |
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>
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/revision.c b/revision.c index cfe3876ce..1d903cf31 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, |