summaryrefslogtreecommitdiff
path: root/t/t3600-rm.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-03-20 10:07:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-20 17:20:14 (GMT)
commit99094a7ad484085b9f6849a8ebe1e23467c5bc14 (patch)
treec47fba4be6766c5ec5bec48108fe1e96ce22bb40 /t/t3600-rm.sh
parent60687de5ba3eb90f8332fb1bcec73a2cb782c95c (diff)
downloadgit-99094a7ad484085b9f6849a8ebe1e23467c5bc14.zip
git-99094a7ad484085b9f6849a8ebe1e23467c5bc14.tar.gz
git-99094a7ad484085b9f6849a8ebe1e23467c5bc14.tar.bz2
t: fix trivial &&-chain breakage
These are tests which are missing a link in their &&-chain, but during a setup phase. We may fail to notice failure in commands that build the test environment, but these are typically not expected to fail at all (but it's still good to double-check that our test environment is what we expect). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3600-rm.sh')
-rwxr-xr-xt/t3600-rm.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index b0db89b..1962989 100755
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -183,7 +183,7 @@ test_expect_success 'refuse to remove cached empty file with modifications' '
test_expect_success 'remove intent-to-add file without --force' '
echo content >intent-to-add &&
- git add -N intent-to-add
+ git add -N intent-to-add &&
git rm --cached intent-to-add
'
@@ -201,7 +201,7 @@ test_expect_success 'Recursive without -r fails' '
'
test_expect_success 'Recursive with -r but dirty' '
- echo qfwfq >>frotz/nitfol
+ echo qfwfq >>frotz/nitfol &&
test_must_fail git rm -r frotz &&
test -d frotz &&
test -f frotz/nitfol