Subject: [PATCH v2 00/17] tests: access bare repositories explicitly

From: "Johannes Schindelin via GitGitGadget" <[email-masked]>
Date: Sat, 04 Apr 2026 19:49:40 +0000

The safe.bareRepository configuration variable (introduced in 8d1a7448206e)
allows restricting implicit bare repository discovery. Its default may well
change to "explicit" in Git v3.0, at which point any test that relies on
implicit discovery of a bare repository would break, even if the test
subject has nothing to do with bare repositories.

This series adjusts 16 test scripts and git-p4 so that they access bare
repositories explicitly. The techniques used are:

 * Replace git -C <bare-repo> ... with git --git-dir=<bare-repo> ...
 * Export GIT_DIR=. after cd-ing into a bare repository
 * Wrap commands in (GIT_DIR=<path> && export GIT_DIR && ...)
 * Add test_config_global safe.bareRepository all in the few tests where
   implicit discovery is genuinely part of what is being tested

Each commit is a self-contained fix to one test file (or a small related
group).

This patch series is part of https://github.com/gitgitgadget/git/pull/2072.

Changes since v1:

 * Dramatically simplified the patch "t5509: specify bare repository path
   explicitly"

Johannes Schindelin (17):
  t0001: allow implicit bare repo discovery for aliased-command test
  t0001: replace `cd`+`git` with `git --git-dir` in `check_config`
  t0003: use `--git-dir` for bare repo attribute tests
  t0056: allow implicit bare repo discovery for `-C` work-tree tests
  t1020: use `--git-dir` instead of subshell for bare repo
  t1900: avoid using `-C <dir>` for a bare repository
  t2400: explicitly specify bare repo for `git worktree add`
  t2406: use `--git-dir=.` for bare repository worktree repair
  t5503: avoid discovering a bare repository
  t5505: export `GIT_DIR` after `git init --bare`
  t5509: specify bare repository path explicitly
  t5540/t5541: avoid accessing a bare repository via `-C <dir>`
  t5619: wrap `test_commit_bulk` in `GIT_DIR` subshell for bare repo
  t6020: use `-C` for worktree, `--git-dir` for bare repository
  t9210: pass `safe.bareRepository=all` to `scalar register`
  t9700: stop relying on implicit bare repo discovery
  git p4 clone --bare: need to be explicit about the gitdir

 git-p4.py                                  |  1 +
 t/lib-httpd.sh                             | 12 ++--
 t/t0001-init.sh                            |  5 +-
 t/t0003-attributes.sh                      | 66 +++++++++-------------
 t/t0056-git-C.sh                           |  2 +
 t/t1020-subdirectory.sh                    |  5 +-
 t/t1900-repo-info.sh                       |  7 ++-
 t/t2400-worktree-add.sh                    | 21 +++----
 t/t2406-worktree-repair.sh                 |  2 +-
 t/t5503-tagfollow.sh                       | 13 ++---
 t/t5505-remote.sh                          |  4 +-
 t/t5509-fetch-push-namespaces.sh           |  6 +-
 t/t5619-clone-local-ambiguous-transport.sh |  2 +-
 t/t6020-bundle-misc.sh                     |  4 +-
 t/t9210-scalar.sh                          |  2 +-
 t/t9700/test.pl                            |  9 ++-
 16 files changed, 71 insertions(+), 90 deletions(-)

base-commit: cf2139f8e1680b076e115bc0b349e369b4b0ecc4
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2076%2Fdscho%2Ftests-explicit-bare-repo-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2076/dscho/tests-explicit-bare-repo-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/2076

Range-diff vs v1:

  1:  a1cdbd58f0 =  1:  a1cdbd58f0 t0001: allow implicit bare repo discovery for aliased-command test
  2:  78744602fb =  2:  78744602fb t0001: replace `cd`+`git` with `git --git-dir` in `check_config`
  3:  a4f7a6df51 =  3:  a4f7a6df51 t0003: use `--git-dir` for bare repo attribute tests
  4:  5b6bb18632 =  4:  5b6bb18632 t0056: allow implicit bare repo discovery for `-C` work-tree tests
  5:  c38f0a68f1 =  5:  c38f0a68f1 t1020: use `--git-dir` instead of subshell for bare repo
  6:  a084c39273 =  6:  a084c39273 t1900: avoid using `-C <dir>` for a bare repository
  7:  6a7730cf57 =  7:  6a7730cf57 t2400: explicitly specify bare repo for `git worktree add`
  8:  2905e000c5 =  8:  2905e000c5 t2406: use `--git-dir=.` for bare repository worktree repair
  9:  9001883e15 =  9:  9001883e15 t5503: avoid discovering a bare repository
 10:  6932658411 = 10:  6932658411 t5505: export `GIT_DIR` after `git init --bare`
 11:  f6fc807af6 ! 11:  2f1e745b55 t5509: specify bare repository path explicitly
     @@ Metadata
       ## Commit message ##
          t5509: specify bare repository path explicitly
      
     -    After switching from `-C pushee` to `--git-dir=pushee` as part of
     -    the `safe.bareRepository` preparation, `ext::` URLs that used `.`
     -    (resolved relative to the `-C` target) must spell out the directory
     -    name explicitly.
     +    When `ls-remote` is told to switch the current working directory to the
     +    bare repository `pushee` via `-C pushee`, as part of the
     +    `safe.bareRepository` preparation let's append `--git-dir=.` to spell
     +    out that this is a bare repository that does not need to be discovered
     +    implictly.
      
          Signed-off-by: Johannes Schindelin <[email-masked]>
      
     @@ t/t5509-fetch-push-namespaces.sh: test_expect_success 'mirroring a repository us
       test_expect_success 'hide namespaced refs with transfer.hideRefs' '
       	GIT_NAMESPACE=namespace \
      -		git -C pushee -c transfer.hideRefs=refs/tags \
     --		ls-remote "ext::git %s ." >actual &&
     -+		git --git-dir=pushee -c transfer.hideRefs=refs/tags \
     -+		ls-remote "ext::git %s pushee" >actual &&
     ++		git -C pushee --git-dir=. -c transfer.hideRefs=refs/tags \
     + 		ls-remote "ext::git %s ." >actual &&
       	printf "$commit1\trefs/heads/main\n" >expected &&
       	test_cmp expected actual
     - '
      @@ t/t5509-fetch-push-namespaces.sh: test_expect_success 'hide namespaced refs with transfer.hideRefs' '
       test_expect_success 'check that transfer.hideRefs does not match unstripped refs' '
       	git -C pushee pack-refs --all &&
       	GIT_NAMESPACE=namespace \
      -		git -C pushee -c transfer.hideRefs=refs/namespaces/namespace/refs/tags \
     --		ls-remote "ext::git %s ." >actual &&
     -+		git --git-dir=pushee -c transfer.hideRefs=refs/namespaces/namespace/refs/tags \
     -+		ls-remote "ext::git %s pushee" >actual &&
     ++		git -C pushee --git-dir=. -c transfer.hideRefs=refs/namespaces/namespace/refs/tags \
     + 		ls-remote "ext::git %s ." >actual &&
       	printf "$commit1\trefs/heads/main\n" >expected &&
       	printf "$commit0\trefs/tags/0\n" >>expected &&
     - 	printf "$commit1\trefs/tags/1\n" >>expected &&
      @@ t/t5509-fetch-push-namespaces.sh: test_expect_success 'check that transfer.hideRefs does not match unstripped refs
       
       test_expect_success 'hide full refs with transfer.hideRefs' '
       	GIT_NAMESPACE=namespace \
      -		git -C pushee -c transfer.hideRefs="^refs/namespaces/namespace/refs/tags" \
     --		ls-remote "ext::git %s ." >actual &&
     -+		git --git-dir=pushee -c transfer.hideRefs="^refs/namespaces/namespace/refs/tags" \
     -+		ls-remote "ext::git %s pushee" >actual &&
     ++		git -C pushee --git-dir=. -c transfer.hideRefs="^refs/namespaces/namespace/refs/tags" \
     + 		ls-remote "ext::git %s ." >actual &&
       	printf "$commit1\trefs/heads/main\n" >expected &&
       	test_cmp expected actual
     - '
 12:  5aa3f2a225 = 12:  c8789bd542 t5540/t5541: avoid accessing a bare repository via `-C <dir>`
 13:  97f22f9e87 = 13:  f09a96e55d t5619: wrap `test_commit_bulk` in `GIT_DIR` subshell for bare repo
 14:  1ae4caf155 = 14:  01ec77c908 t6020: use `-C` for worktree, `--git-dir` for bare repository
 15:  861a8e0940 = 15:  00eaefbf62 t9210: pass `safe.bareRepository=all` to `scalar register`
 16:  1f1668a6f4 = 16:  890dfd024d t9700: stop relying on implicit bare repo discovery
 17:  c8e5bef27b = 17:  139b9da946 git p4 clone --bare: need to be explicit about the gitdir

-- 
gitgitgadget