Merge branch 'ty/move-protect-hfs-ntfs' into jch

The global configuration variables protect_hfs and protect_ntfs have
been migrated into struct repo_config_values to tie them to
per-repository configuration state.

* ty/move-protect-hfs-ntfs:
  environment: use 'repo->initialized' for repo_protect_hfs() and repo_protect_ntfs()
  environment: move 'protect_hfs' and 'protect_ntfs' into 'repo_config_values'

diff --cc compat/mingw.c
Simple merge

diff --cc environment.c
index ba2c60103ff51c5e50a6c0e08635c9a3453eead6,f34f6fc7507f6b2c850b9295bbf2880120c400ef..ff862dccf9e13f595a04dfa0fc08435a9f611739
--- 1/environment.c
--- 2/environment.c
+++ b/environment.c
@@@ -716,13 -732,7 +728,15 @@@ void repo_config_values_init(struct rep
  {
        cfg->attributes_file = NULL;
        cfg->apply_sparse_checkout = 0;
+       cfg->protect_hfs = PROTECT_HFS_DEFAULT;
+       cfg->protect_ntfs = PROTECT_NTFS_DEFAULT;
        cfg->branch_track = BRANCH_TRACK_REMOTE;
 +      cfg->trust_ctime = 1;
 +      cfg->check_stat = 1;
 +      cfg->zlib_compression_level = Z_BEST_SPEED;
 +      cfg->pack_compression_level = Z_DEFAULT_COMPRESSION;
 +      cfg->precomposed_unicode = -1; /* see probe_utf8_pathname_composition() */
 +      cfg->core_sparse_checkout_cone = 0;
 +      cfg->sparse_expect_files_outside_of_patterns = 0;
 +      cfg->warn_on_object_refname_ambiguity = 1;
  }

diff --cc environment.h
index 6f182869558395caeaf6f0595c331564ccf0d8c7,b1ae4a70decc7c9b945c41c9760701006898d8ec..0ccf0a0e6e49669f0716cc8e22ba6c0e2a3b6b13
--- 1/environment.h
--- 2/environment.h
+++ b/environment.h
@@@ -91,17 -91,9 +91,19 @@@ struct repo_config_values 
        /* section "core" config values */
        char *attributes_file;
        int apply_sparse_checkout;
 +      int trust_ctime;
 +      int check_stat;
 +      int zlib_compression_level;
 +      int pack_compression_level;
 +      int precomposed_unicode;
 +      int core_sparse_checkout_cone;
 +      int warn_on_object_refname_ambiguity;
+       int protect_hfs;
+       int protect_ntfs;
  
 +      /* section "sparse" config values */
 +      int sparse_expect_files_outside_of_patterns;
 +
        /* section "branch" config values */
        enum branch_track branch_track;
  };
@@@ -167,13 -175,18 +177,10 @@@ extern int has_symlinks
  extern int minimum_abbrev, default_abbrev;
  extern int ignore_case;
  extern int assume_unchanged;
 -extern int warn_on_object_refname_ambiguity;
  extern char *apply_default_whitespace;
  extern char *apply_default_ignorewhitespace;
 -extern int zlib_compression_level;
 -extern int pack_compression_level;
  extern unsigned long pack_size_limit_cfg;
  
- extern int protect_hfs;
- extern int protect_ntfs;
 -extern int precomposed_unicode;
 -
 -extern int core_sparse_checkout_cone;
 -extern int sparse_expect_files_outside_of_patterns;
--
  enum rebase_setup_type {
        AUTOREBASE_NEVER = 0,
        AUTOREBASE_LOCAL,

diff --cc read-cache.c
Simple merge