Merge branch 'jk/reject-newer-extensions-in-v0' into master

[thirdparty/git.git] / cache.h

diff --git a/cache.h b/cache.h
index 126ec56c7f33b4f90439363848504263ea48d3f0..0290849c1909fe64d0e749768fd0dea0f965edd7 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -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, \
 }
 
 /*