Merge branch 'maint'

diff --git a/sha1_file.c b/sha1_file.c
index d64f28f8ca5aa841fe5db5d81f0fdee8df6618a4..7459a9cd825907ba0ef48e06e4f46b5c14e1a8ff 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1707,6 +1707,9 @@ static void add_delta_base_cache(struct packed_git *p, off_t base_offset,
        delta_base_cache_lru.prev = &ent->lru;
 }
 
+static void *read_object(const unsigned char *sha1, enum object_type *type,
+                        unsigned long *size);
+
 static void *unpack_delta_entry(struct packed_git *p,
                                struct pack_window **w_curs,
                                off_t curpos,
@@ -2137,8 +2140,8 @@ int pretend_sha1_file(void *buf, unsigned long len, enum object_type type,
        return 0;
 }
 
-void *read_object(const unsigned char *sha1, enum object_type *type,
-                 unsigned long *size)
+static void *read_object(const unsigned char *sha1, enum object_type *type,
+                        unsigned long *size)
 {
        unsigned long mapsize;
        void *map, *buf;