From: Eric Sunshine Date: Mon, 21 Nov 2022 03:00:20 +0000 (+0000) Subject: t1509: make "setup" test more robust X-Git-Tag: v2.40.0-rc0~99^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce153b8d4d5be93d0960a143d08dcffd55694b0e;p=thirdparty%2Fgit.git t1509: make "setup" test more robust One of the t1509 setup tests is very particular about the output it expects from `git init`, and fails if the output differs even slightly which can happen easily if the script is run multiple times since it doesn't do a good job of cleaning up after itself (i.e. it leaves detritus in the root directory `/`). One bit of cruft in particular (`/HEAD`) makes the test fail since its presence causes `git init` to alter its output; rather than reporting "Initialized empty Git repository", it instead reports "Reinitialized existing Git repository" when `/HEAD` is present. Address this problem by making the test do a more careful job of crafting its intended initial state. Signed-off-by: Eric Sunshine --- diff --git a/t/t1509-root-work-tree.sh b/t/t1509-root-work-tree.sh index eb57fe7e19..d041762628 100755 --- a/t/t1509-root-work-tree.sh +++ b/t/t1509-root-work-tree.sh @@ -243,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 &&