Merge branch 'jc/index-output'

diff --git a/cache.h b/cache.h
index ece0c041f5f4747b09bdf4300a74b5bc242a3dad..1b50c32b139256c5d8be96a85b02f1ce9855f15a 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -211,6 +211,11 @@ struct lock_file {
 };
 extern int hold_lock_file_for_update(struct lock_file *, const char *path, int);
 extern int commit_lock_file(struct lock_file *);
+
+extern int hold_locked_index(struct lock_file *, int);
+extern int commit_locked_index(struct lock_file *);
+extern void set_alternate_index_output(const char *);
+
 extern void rollback_lock_file(struct lock_file *);
 extern int delete_ref(const char *, unsigned char *sha1);