git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 12/17] t5540/t5541: avoid accessing a bare repository via `-C <dir>`

From
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
Date
Apr 2, 2026, 14:33 UTC
Message-ID
<5aa3f2a225b9b22a026e0994f2eef583da9d26db.1775140403.git.gitgitgadget@gmail.com>
In-Reply-To
<pull.2076.git.1775140403.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>

In the `test_http_push_nonff` function both of these test scripts call, there were two Git invocations that assume that bare repositories will always be discovered when the current working directory is inside one. This is unlikely to be true forever because at some stage, the `safe.bareRepository` config is prone to be modified to be safe by default.

So let's be safe and specify the bare repository explicitly.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/lib-httpd.sh | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index 4c76e813e3..f15158b2c5 100644
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -259,7 +259,7 @@ test_http_push_nonff () {
 
 	test_expect_success 'non-fast-forward push fails' '
 		cd "$REMOTE_REPO" &&
-		HEAD=$(git rev-parse --verify HEAD) &&
+		HEAD=$(git --git-dir=. rev-parse --verify HEAD) &&
 
 		cd "$LOCAL_REPO" &&
 		git checkout $BRANCH &&
@@ -270,7 +270,7 @@ test_http_push_nonff () {
 		(
 			cd "$REMOTE_REPO" &&
 			echo "$HEAD" >expect &&
-			git rev-parse --verify HEAD >actual &&
+			git --git-dir=. rev-parse --verify HEAD >actual &&
 			test_cmp expect actual
 		)
 	'
@@ -284,18 +284,16 @@ test_http_push_nonff () {
 	'
 
 	test_expect_${EXPECT_CAS_RESULT} 'force with lease aka cas' '
-		HEAD=$(	cd "$REMOTE_REPO" && git rev-parse --verify HEAD ) &&
+		HEAD=$(git --git-dir="$REMOTE_REPO" rev-parse --verify HEAD) &&
 		test_when_finished '\''
-			(cd "$REMOTE_REPO" && git update-ref HEAD "$HEAD")
+			git --git-dir="$REMOTE_REPO" update-ref HEAD "$HEAD"
 		'\'' &&
 		(
 			cd "$LOCAL_REPO" &&
 			git push -v --force-with-lease=$BRANCH:$HEAD origin
 		) &&
 		git rev-parse --verify "$BRANCH" >expect &&
-		(
-			cd "$REMOTE_REPO" && git rev-parse --verify HEAD
-		) >actual &&
+		git --git-dir="$REMOTE_REPO" rev-parse --verify HEAD >actual &&
 		test_cmp expect actual
 	'
 }
-- 
gitgitgadget
Previous: Johannes SchindelinNext: Johannes Schindelin via GitGitGadget
Message 17 of 44 in “tests: access bare repositories explicitly”
  1. 00/17 tests: access bare repositories explicitlyJohannes Schindelin via GitGitGadget, Apr 2, 2026
  2. 01/17 t0001: allow implicit bare repo discovery for aliased-command testJohannes Schindelin via GitGitGadget, Apr 2, 2026
  3. 02/17 t0001: replace `cd`+`git` with `git --git-dir` in `check_config`Johannes Schindelin via GitGitGadget, Apr 2, 2026
  4. 03/17 t0003: use `--git-dir` for bare repo attribute testsJohannes Schindelin via GitGitGadget, Apr 2, 2026
  5. 04/17 t0056: allow implicit bare repo discovery for `-C` work-tree testsJohannes Schindelin via GitGitGadget, Apr 2, 2026
  6. 05/17 t1020: use `--git-dir` instead of subshell for bare repoJohannes Schindelin via GitGitGadget, Apr 2, 2026
  7. 06/17 t1900: avoid using `-C <dir>` for a bare repositoryJohannes Schindelin via GitGitGadget, Apr 2, 2026
  8. 07/17 t2400: explicitly specify bare repo for `git worktree add`Johannes Schindelin via GitGitGadget, Apr 2, 2026
  9. 08/17 t2406: use `--git-dir=.` for bare repository worktree repairJohannes Schindelin via GitGitGadget, Apr 2, 2026
  10. 09/17 t5503: avoid discovering a bare repositoryJohannes Schindelin via GitGitGadget, Apr 2, 2026
  11. 10/17 t5505: export `GIT_DIR` after `git init --bare`Johannes Schindelin via GitGitGadget, Apr 2, 2026
  12. 11/17 t5509: specify bare repository path explicitlyJohannes Schindelin via GitGitGadget, Apr 2, 2026
  13. Junio C HamanoApr 2, 2026
  14. Johannes SchindelinApr 3, 2026
  15. Junio C HamanoApr 3, 2026
  16. Johannes SchindelinApr 4, 2026
  17. 12/17 t5540/t5541: avoid accessing a bare repository via `-C <dir>`Johannes Schindelin via GitGitGadget, Apr 2, 2026
  18. 13/17 t5619: wrap `test_commit_bulk` in `GIT_DIR` subshell for bare repoJohannes Schindelin via GitGitGadget, Apr 2, 2026
  19. 14/17 t6020: use `-C` for worktree, `--git-dir` for bare repositoryJohannes Schindelin via GitGitGadget, Apr 2, 2026
  20. 15/17 t9210: pass `safe.bareRepository=all` to `scalar register`Johannes Schindelin via GitGitGadget, Apr 2, 2026
  21. 16/17 t9700: stop relying on implicit bare repo discoveryJohannes Schindelin via GitGitGadget, Apr 2, 2026
  22. 17/17 git p4 clone --bare: need to be explicit about the gitdirJohannes Schindelin via GitGitGadget, Apr 2, 2026
  23. Junio C HamanoApr 2, 2026
  24. Johannes SchindelinApr 4, 2026
  25. Junio C HamanoApr 6, 2026
  26. 00/17 tests: access bare repositories explicitlyJohannes Schindelin via GitGitGadget, Apr 4, 2026
  27. 01/17 t0001: allow implicit bare repo discovery for aliased-command testJohannes Schindelin via GitGitGadget, Apr 4, 2026
  28. Junio C HamanoApr 6, 2026
  29. 02/17 t0001: replace `cd`+`git` with `git --git-dir` in `check_config`Johannes Schindelin via GitGitGadget, Apr 4, 2026
  30. 03/17 t0003: use `--git-dir` for bare repo attribute testsJohannes Schindelin via GitGitGadget, Apr 4, 2026
  31. 04/17 t0056: allow implicit bare repo discovery for `-C` work-tree testsJohannes Schindelin via GitGitGadget, Apr 4, 2026
  32. 05/17 t1020: use `--git-dir` instead of subshell for bare repoJohannes Schindelin via GitGitGadget, Apr 4, 2026
  33. 06/17 t1900: avoid using `-C <dir>` for a bare repositoryJohannes Schindelin via GitGitGadget, Apr 4, 2026
  34. 07/17 t2400: explicitly specify bare repo for `git worktree add`Johannes Schindelin via GitGitGadget, Apr 4, 2026
  35. 08/17 t2406: use `--git-dir=.` for bare repository worktree repairJohannes Schindelin via GitGitGadget, Apr 4, 2026
  36. 09/17 t5503: avoid discovering a bare repositoryJohannes Schindelin via GitGitGadget, Apr 4, 2026
  37. 10/17 t5505: export `GIT_DIR` after `git init --bare`Johannes Schindelin via GitGitGadget, Apr 4, 2026
  38. 11/17 t5509: specify bare repository path explicitlyJohannes Schindelin via GitGitGadget, Apr 4, 2026
  39. 12/17 t5540/t5541: avoid accessing a bare repository via `-C <dir>`Johannes Schindelin via GitGitGadget, Apr 4, 2026
  40. 13/17 t5619: wrap `test_commit_bulk` in `GIT_DIR` subshell for bare repoJohannes Schindelin via GitGitGadget, Apr 4, 2026
  41. 14/17 t6020: use `-C` for worktree, `--git-dir` for bare repositoryJohannes Schindelin via GitGitGadget, Apr 4, 2026
  42. 15/17 t9210: pass `safe.bareRepository=all` to `scalar register`Johannes Schindelin via GitGitGadget, Apr 4, 2026
  43. 16/17 t9700: stop relying on implicit bare repo discoveryJohannes Schindelin via GitGitGadget, Apr 4, 2026
  44. 17/17 git p4 clone --bare: need to be explicit about the gitdirJohannes Schindelin via GitGitGadget, Apr 4, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.