Merge branch 'es/t1509-root-fixes'

Test fixes.

* es/t1509-root-fixes:
  t1509: facilitate repeated script invocations
  t1509: make "setup" test more robust
  t1509: fix failing "root work tree" test due to owner-check
This commit is contained in:
Junio C Hamano 2023-01-16 12:07:45 -08:00
commit 7c7357910b

View File

@ -221,7 +221,8 @@ test_expect_success 'setup' '
rm -rf /.git &&
echo "Initialized empty Git repository in /.git/" > expected &&
git init > result &&
test_cmp expected result
test_cmp expected result &&
git config --global --add safe.directory /
'
test_vars 'auto gitdir, root' ".git" "/" ""
@ -242,7 +243,7 @@ say "auto bare gitdir"
# DESTROYYYYY!!!!!
test_expect_success 'setup' '
rm -rf /refs /objects /info /hooks &&
rm -f /expected /ls.expected /me /result &&
rm -f /HEAD /expected /ls.expected /me /result &&
cd / &&
echo "Initialized empty Git repository in /" > expected &&
git init --bare > result &&
@ -255,4 +256,9 @@ test_expect_success 'go to /foo' 'cd /foo'
test_vars 'auto gitdir, root' "/" "" ""
test_expect_success 'cleanup root' '
rm -rf /.git /refs /objects /info /hooks /branches /foo &&
rm -f /HEAD /config /description /expected /ls.expected /me /result
'
test_done