Merge branch 'lh/merge'

diff --git a/cache.h b/cache.h
index 5587f7ebc74a597b54de6014896fcd5481fe4ec9..6a49e3049b659536ae4263cfff7190173f2c7ade 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -531,6 +531,7 @@ extern void *unpack_entry(struct packed_git *, off_t, enum object_type *, unsign
 extern unsigned long unpack_object_header_gently(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep);
 extern unsigned long get_size_from_delta(struct packed_git *, struct pack_window **, off_t);
 extern const char *packed_object_info_detail(struct packed_git *, off_t, unsigned long *, unsigned long *, unsigned int *, unsigned char *);
+extern int matches_pack_name(struct packed_git *p, const char *name);
 
 /* Dumb servers support */
 extern int update_server_info(int);