Merge branch 'jk/repository-extension' into maint

diff --git a/cache.h b/cache.h
index 79066e57dc806d118366d9807e0af338b72e2fb2..d801429e0c34e085719b442ebc114f3fcb519f80 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -696,8 +696,15 @@ extern char *notes_ref_name;
 
 extern int grafts_replace_parents;
 
+/*
+ * GIT_REPO_VERSION is the version we write by default. The
+ * _READ variant is the highest number we know how to
+ * handle.
+ */
 #define GIT_REPO_VERSION 0
+#define GIT_REPO_VERSION_READ 1
 extern int repository_format_version;
+extern int repository_format_precious_objects;
 extern int check_repository_format(void);
 
 #define MTIME_CHANGED  0x0001