Merge branch 'jc/name-rev-lw-tag'

diff --git a/refs.h b/refs.h
index d18ef47128688b6bee35b4bd5ae5c42bc3e6690e..685a979a0eb70b1f49b455c279f51c9c392a3d3c 100644 (file)
--- a/refs.h
+++ b/refs.h
@@ -602,10 +602,10 @@ enum expire_reflog_flags {
  *     unlocked again.
  */
 typedef void reflog_expiry_prepare_fn(const char *refname,
-                                     const unsigned char *sha1,
+                                     const struct object_id *oid,
                                      void *cb_data);
-typedef int reflog_expiry_should_prune_fn(unsigned char *osha1,
-                                         unsigned char *nsha1,
+typedef int reflog_expiry_should_prune_fn(struct object_id *ooid,
+                                         struct object_id *noid,
                                          const char *email,
                                          timestamp_t timestamp, int tz,
                                          const char *message, void *cb_data);