Merge branch 'rs/sort-oid-array-thread-safe'

diff --git a/repository.h b/repository.h
index cc285ad3278bf8ac40dfb780afa523e2ee280029..4da275e73fac1a97c39109b7bf31ae01f20e0730 100644 (file)
--- a/repository.h
+++ b/repository.h
@@ -11,6 +11,20 @@ struct pathspec;
 struct raw_object_store;
 struct submodule_cache;
 
+enum untracked_cache_setting {
+       UNTRACKED_CACHE_UNSET = -1,
+       UNTRACKED_CACHE_REMOVE = 0,
+       UNTRACKED_CACHE_KEEP = 1,
+       UNTRACKED_CACHE_WRITE = 2
+};
+
+enum fetch_negotiation_setting {
+       FETCH_NEGOTIATION_UNSET = -1,
+       FETCH_NEGOTIATION_NONE = 0,
+       FETCH_NEGOTIATION_DEFAULT = 1,
+       FETCH_NEGOTIATION_SKIPPING = 2,
+};
+
 struct repo_settings {
        int initialized;
 
@@ -18,8 +32,10 @@ struct repo_settings {
        int gc_write_commit_graph;
 
        int index_version;
+       enum untracked_cache_setting core_untracked_cache;
 
        int pack_use_sparse;
+       enum fetch_negotiation_setting fetch_negotiation_algorithm;
 };
 
 struct repository {