Merge branch 'es/clone-shared-worktree'

diff --git a/pack-bitmap.h b/pack-bitmap.h
index 0adcef77b58cc13822f1b400d5418ec6f8b34421..3742a00e14a0d4da335253b2a76f978edb499d35 100644 (file)
--- a/pack-bitmap.h
+++ b/pack-bitmap.h
@@ -27,7 +27,7 @@ enum pack_bitmap_flags {
 };
 
 typedef int (*show_reachable_fn)(
-       const unsigned char *sha1,
+       const struct object_id *oid,
        enum object_type type,
        int flags,
        uint32_t hash,