Merge branch 'js/gitdir-at-unc-root'

diff --git a/repository.h b/repository.h
index cf7ff0778c853b55fff917959797de579b4a0412..4da275e73fac1a97c39109b7bf31ae01f20e0730 100644 (file)
--- a/repository.h
+++ b/repository.h
@@ -18,6 +18,13 @@ enum untracked_cache_setting {
        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;
 
@@ -28,6 +35,7 @@ struct repo_settings {
        enum untracked_cache_setting core_untracked_cache;
 
        int pack_use_sparse;
+       enum fetch_negotiation_setting fetch_negotiation_algorithm;
 };
 
 struct repository {