Merge with master changes.

diff --git a/cache.h b/cache.h
index dbde95a0b687fcc528aa32629bbf6f4d4ba488df..f14a4ce91aa83c0ed853c6d9fd9a7b6bc2cc12db 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -319,6 +319,8 @@ extern int get_ack(int fd, unsigned char *result_sha1);
 extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match);
 
 extern struct packed_git *parse_pack_index(unsigned char *sha1);
+extern struct packed_git *parse_pack_index_file(unsigned char *sha1, 
+                                               char *idx_path);
 
 extern void prepare_packed_git(void);
 extern void install_packed_git(struct packed_git *pack);