Merge branch 'lt/maint-gitdir-relative'

[git.git] / cache.h

diff --git a/cache.h b/cache.h
index 23f3b923350669001fffdc8c670825bdaefa7f3c..56ac6e7f4702d0c1665c73e8fc44cfc047bcfd33 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -525,6 +525,7 @@ static inline int is_absolute_path(const char *path)
 }
 const char *make_absolute_path(const char *path);
 const char *make_nonrelative_path(const char *path);
+const char *make_relative_path(const char *abs, const char *base);
 
 /* Read and unpack a sha1 file into memory, write memory to a sha1 file */
 extern int sha1_object_info(const unsigned char *, unsigned long *);
@@ -694,8 +695,6 @@ extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, ch
 extern int server_supports(const char *feature);
 
 extern struct packed_git *parse_pack_index(unsigned char *sha1);
-extern struct packed_git *parse_pack_index_file(const unsigned char *sha1,
-                                               const char *idx_path);
 
 extern void prepare_packed_git(void);
 extern void reprepare_packed_git(void);