From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Jun 2026 20:21:08 +0000 (-0700)
Subject: Merge branch 'ty/move-protect-hfs-ntfs' into jch
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3559d3801c1cd71086694ac2d16d95733123844;p=thirdparty%2Fgit.git

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'
---

f3559d3801c1cd71086694ac2d16d95733123844
diff --cc environment.c
index ba2c60103f,f34f6fc750..ff862dccf9
--- a/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 6f18286955,b1ae4a70de..0ccf0a0e6e
--- a/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,