From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 6 Jul 2026 22:50:19 +0000 (-0700)
Subject: Merge branch 'ps/setup-drop-global-state'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e49c0e898a540577c42ee3693368a273534dc9eb;p=thirdparty%2Fgit.git

Merge branch 'ps/setup-drop-global-state'

The refactoring of 'setup.c' has been continued to drop remaining
global state (`git_work_tree_cfg`, `is_bare_repository_cfg`), updating
`is_bare_repository()` to no longer implicitly rely on
`the_repository`.

* ps/setup-drop-global-state:
  treewide: drop USE_THE_REPOSITORY_VARIABLE
  environment: stop using `the_repository` in `is_bare_repository()`
  environment: split up concerns of `is_bare_repository_cfg`
  builtin/init: stop modifying `is_bare_repository_cfg`
  setup: remove global `git_work_tree_cfg` variable
  builtin/init: simplify logic to configure worktree
  builtin/init: stop modifying global `git_work_tree_cfg` variable
---

e49c0e898a540577c42ee3693368a273534dc9eb
diff --cc environment.c
index ba2c60103f,bf20953415..bee2cd621a
--- a/environment.c
+++ b/environment.c
@@@ -46,7 -48,7 +46,6 @@@ int has_symlinks = 1
  int minimum_abbrev = 4, default_abbrev = -1;
  int ignore_case;
  int assume_unchanged;
- int is_bare_repository_cfg = -1; /* unspecified */
 -int warn_on_object_refname_ambiguity = 1;
  char *git_commit_encoding;
  char *git_log_output_encoding;
  char *apply_default_whitespace;
diff --cc environment.h
index 6f18286955,164a55df2c..f5b9b33c90
--- a/environment.h
+++ b/environment.h
@@@ -157,12 -149,10 +159,8 @@@ int is_bare_repository(struct repositor
   */
  int have_git_dir(void);
  
- extern int is_bare_repository_cfg;
- int is_bare_repository(void);
- extern char *git_work_tree_cfg;
- 
  /* Environment bits from configuration mechanism */
  extern int trust_executable_bit;
 -extern int trust_ctime;
 -extern int check_stat;
  extern int has_symlinks;
  extern int minimum_abbrev, default_abbrev;
  extern int ignore_case;