aboutsummaryrefslogtreecommitdiff
path: root/t/t9106-git-svn-commit-diff-clobber.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/t9106-git-svn-commit-diff-clobber.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/t9106-git-svn-commit-diff-clobber.sh')
-rwxr-xr-xt/t9106-git-svn-commit-diff-clobber.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t9106-git-svn-commit-diff-clobber.sh b/t/t9106-git-svn-commit-diff-clobber.sh
index 58a3a7b1c..a57ff68e0 100755
--- a/t/t9106-git-svn-commit-diff-clobber.sh
+++ b/t/t9106-git-svn-commit-diff-clobber.sh
@@ -27,7 +27,7 @@ test_expect_success 'commit change from svn side' '
test_expect_success 'commit conflicting change from git' '
echo second line from git >> file &&
git commit -a -m "second line from git" &&
- ! git-svn commit-diff -r1 HEAD~1 HEAD "$svnrepo"
+ test_must_fail git-svn commit-diff -r1 HEAD~1 HEAD "$svnrepo"
'
test_expect_success 'commit complementing change from git' '
@@ -52,7 +52,7 @@ test_expect_success 'dcommit fails to commit because of conflict' '
rm -rf t.svn &&
echo "fourth line from git" >> file &&
git commit -a -m "fourth line from git" &&
- ! git-svn dcommit
+ test_must_fail git-svn dcommit
'
test_expect_success 'dcommit does the svn equivalent of an index merge' "
@@ -83,7 +83,7 @@ test_expect_success 'multiple dcommit from git-svn will not clobber svn' "
git commit -a -m 'new file' &&
echo clobber > file &&
git commit -a -m 'clobber' &&
- ! git svn dcommit
+ test_must_fail git svn dcommit
"