Merge branch 'jt/interpret-branch-name-fallback'

[thirdparty/git.git] / cache.h

diff --git a/cache.h b/cache.h
index f0090a00210b4a34529c82f300b5465f23bd4046..cee8aa5dc325a422ac6ba7a7795fb05afd8ae642 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -921,8 +921,8 @@ extern int assume_unchanged;
 extern int prefer_symlink_refs;
 extern int warn_ambiguous_refs;
 extern int warn_on_object_refname_ambiguity;
-extern const char *apply_default_whitespace;
-extern const char *apply_default_ignorewhitespace;
+extern char *apply_default_whitespace;
+extern char *apply_default_ignorewhitespace;
 extern const char *git_attributes_file;
 extern const char *git_hooks_path;
 extern int zlib_compression_level;
@@ -1044,6 +1044,7 @@ struct repository_format {
        int hash_algo;
        char *work_tree;
        struct string_list unknown_extensions;
+       struct string_list v1_only_extensions;
 };
 
 /*
@@ -1057,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, \
 }
 
 /*