summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-03-20 10:44:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-20 10:53:57 -0700
commit807e3cac46663481e432c675bd61d37b886c74b2 (patch)
tree8bdf812a3072ef36b35afe78efcc1f588961a0de
parentt2026 needs procondition SANITY (diff)
downloadtgif-807e3cac46663481e432c675bd61d37b886c74b2.tar.xz
t2026: fix broken &&-chain
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t2026-prune-linked-checkouts.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t2026-prune-linked-checkouts.sh b/t/t2026-prune-linked-checkouts.sh
index 2936d52a9c..e885bafc97 100755
--- a/t/t2026-prune-linked-checkouts.sh
+++ b/t/t2026-prune-linked-checkouts.sh
@@ -65,7 +65,7 @@ test_expect_success 'prune directories with gitdir pointing to nowhere' '
'
test_expect_success 'not prune locked checkout' '
- test_when_finished rm -r .git/worktrees
+ test_when_finished rm -r .git/worktrees &&
mkdir -p .git/worktrees/ghi &&
: >.git/worktrees/ghi/locked &&
git prune --worktrees &&
@@ -73,7 +73,7 @@ test_expect_success 'not prune locked checkout' '
'
test_expect_success 'not prune recent checkouts' '
- test_when_finished rm -r .git/worktrees
+ test_when_finished rm -r .git/worktrees &&
mkdir zz &&
mkdir -p .git/worktrees/jlm &&
echo "$(pwd)"/zz >.git/worktrees/jlm/gitdir &&