d1931bcf0d (refs: make errno output explicit for refs_resolve_ref_unsafe, 2021-07-20) add a test for a crash when refs is a symlink, but it fails on windows. add the missing SYMLINKS dependency and while at it, refactor it slightly to comply better with the CodingGuidelines. Reported-by: Jeff King <peff@xxxxxxxx> Signed-off-by: Carlo Marcelo Arenas Belón <carenas@xxxxxxxxx> --- t/t3200-branch.sh | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index dd17718160..6d8700664e 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -109,17 +109,22 @@ test_expect_success 'git branch -m n/n n should work' ' git reflog exists refs/heads/n ' -test_expect_success 'git branch -m with symlinked .git/refs' ' +test_expect_success SYMLINKS 'git branch -m with symlinked .git/refs' ' git init subdir && test_when_finished "rm -rf subdir" && - (cd subdir && - for d in refs objects packed-refs ; do - rm -rf .git/$d && - ln -s ../../.git/$d .git/$d ; done ) && + ( + cd subdir && + for d in refs objects packed-refs + do + rm -rf .git/$d && + ln -s ../../.git/$d .git/$d + done + ) && git --git-dir subdir/.git/ branch rename-src && - expect=$(git rev-parse rename-src) && + git rev-parse rename-src >expect && git --git-dir subdir/.git/ branch -m rename-src rename-dest && - test $(git rev-parse rename-dest) = "$expect" && + git rev-parse rename-dest >actual && + test_cmp expect actual && git branch -D rename-dest ' base-commit: d1931bcf0d5ef75cdaf836347f4aefce902a6a38 -- 2.33.0.476.gf000ecbed9
