Merge branch 'maint'

diff --git a/pack.h b/pack.h
index f357c9f4282d5bc8bbcff6f3a44b9812415745a6..b31b37608d7f1901c74a20552770c306e633670c 100644 (file)
--- a/pack.h
+++ b/pack.h
@@ -55,10 +55,11 @@ struct pack_idx_entry {
        off_t offset;
 };
 
-extern const char *write_idx_file(const char *index_name, struct pack_idx_entry **objects, int nr_objects, unsigned char *sha1);
+extern char *write_idx_file(char *index_name, struct pack_idx_entry **objects, int nr_objects, unsigned char *sha1);
 
 extern int verify_pack(struct packed_git *, int);
 extern void fixup_pack_header_footer(int, unsigned char *, const char *, uint32_t);
+extern char *index_pack_lockfile(int fd);
 
 #define PH_ERROR_EOF           (-1)
 #define PH_ERROR_PACK_SIGNATURE        (-2)