aboutsummaryrefslogtreecommitdiff
path: root/t/t1200-tutorial.sh
diff options
context:
space:
mode:
authorStephan Beyer <s-beyer@gmx.net>2008-07-12 17:47:52 +0200
committerJunio C Hamano <gitster@pobox.com>2008-07-13 13:21:26 -0700
commitd492b31cafe9aa5ce001b1d48815f4c0bb40d01a (patch)
tree9782e7f8110a866423b8d752783e0fcddc8c0508 /t/t1200-tutorial.sh
parent5a26973025bce74782571844c7b8091d1cd7c405 (diff)
downloadgit-d492b31cafe9aa5ce001b1d48815f4c0bb40d01a.tar.gz
git-d492b31cafe9aa5ce001b1d48815f4c0bb40d01a.tar.xz
t/: Use "test_must_fail git" instead of "! git"
This patch changes every occurrence of "! git" -- with the meaning that a git call has to gracefully fail -- into "test_must_fail git". This is useful to - make sure the test does not fail because of a signal, e.g. SIGSEGV, and - advertise the use of "test_must_fail" for new tests. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1200-tutorial.sh')
-rwxr-xr-xt/t1200-tutorial.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh
index dcb3108c2..09a819933 100755
--- a/t/t1200-tutorial.sh
+++ b/t/t1200-tutorial.sh
@@ -102,7 +102,7 @@ echo "Lots of fun" >>example
git commit -m 'Some fun.' -i hello example
test_expect_success 'git resolve now fails' '
- ! git merge -m "Merge work in mybranch" mybranch
+ test_must_fail git merge -m "Merge work in mybranch" mybranch
'
cat > hello << EOF