diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-20 00:48:52 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-20 00:48:52 +0300 |
| commit | 034603f0a3449129d63d7d344aa118b3d7538172 (patch) | |
| tree | b0e65ecb605e0b1fe784fe277ea9cc165b406c77 /t | |
| parent | 1d82ef5b16663b8b818bc75632d3c7703f6acc2d (diff) | |
| parent | faacc5aa7c3d9c0695bf0203b55c4fd77cd5cda3 (diff) | |
Merge branch 'ps/t1509-chroot-test-fixup'
t1509 test that requires a dedicated VM environment had some
bitrot, which has been corrected.
* ps/t1509-chroot-test-fixup:
tests: fix cleanup after tests in t1509-root-worktree
tests: fix broken && chains in t1509-root-worktree
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1509-root-worktree.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t1509-root-worktree.sh b/t/t1509-root-worktree.sh index b6977d4b39..553a3f601b 100755 --- a/t/t1509-root-worktree.sh +++ b/t/t1509-root-worktree.sh @@ -125,7 +125,7 @@ fi ONE_SHA1=d00491fd7e5bb6fa28c517a0bb32b8b506539d4d test_expect_success 'setup' ' - rm -rf /foo + rm -rf /foo && mkdir /foo && mkdir /foo/bar && echo 1 > /foo/foome && @@ -218,7 +218,7 @@ unset GIT_WORK_TREE test_expect_success 'go to /' 'cd /' test_expect_success 'setup' ' - rm -rf /.git + rm -rf /.git && echo "Initialized empty Git repository in /.git/" > expected && git init > result && test_cmp expected result @@ -241,8 +241,8 @@ say "auto bare gitdir" # DESTROYYYYY!!!!! test_expect_success 'setup' ' - rm -rf /refs /objects /info /hooks - rm /* + rm -rf /refs /objects /info /hooks && + rm -f /expected /ls.expected /me /result && cd / && echo "Initialized empty Git repository in /" > expected && git init --bare > result && |