Merge branch 'rs/preserve-merges-unused-code-removal'

[thirdparty/git.git] / cache.h

diff --git a/cache.h b/cache.h
index e5885cc9ead57a4eba10ad5263f58b94439feb85..0290849c1909fe64d0e749768fd0dea0f965edd7 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -628,7 +628,7 @@ int path_inside_repo(const char *prefix, const char *path);
 
 int init_db(const char *git_dir, const char *real_git_dir,
            const char *template_dir, int hash_algo,
-           unsigned int flags);
+           const char *initial_branch, unsigned int flags);
 void initialize_repository_version(int hash_algo);
 
 void sanitize_stdfds(void);
@@ -1042,9 +1042,9 @@ struct repository_format {
        int worktree_config;
        int is_bare;
        int hash_algo;
-       int has_extensions;
        char *work_tree;
        struct string_list unknown_extensions;
+       struct string_list v1_only_extensions;
 };
 
 /*
@@ -1058,6 +1058,7 @@ struct repository_format {
        .is_bare = -1, \
        .hash_algo = GIT_HASH_SHA1, \
        .unknown_extensions = STRING_LIST_INIT_DUP, \
+       .v1_only_extensions = STRING_LIST_INIT_DUP, \
 }
 
 /*