diff options
| author | Stephan Beyer <s-beyer@gmx.net> | 2008-07-12 17:47:52 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-13 13:21:26 -0700 |
| commit | d492b31cafe9aa5ce001b1d48815f4c0bb40d01a (patch) | |
| tree | 9782e7f8110a866423b8d752783e0fcddc8c0508 /t/t6025-merge-symlinks.sh | |
| parent | 5a26973025bce74782571844c7b8091d1cd7c405 (diff) | |
| download | git-d492b31cafe9aa5ce001b1d48815f4c0bb40d01a.tar.gz | |
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/t6025-merge-symlinks.sh')
| -rwxr-xr-x | t/t6025-merge-symlinks.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t6025-merge-symlinks.sh b/t/t6025-merge-symlinks.sh index 6004deb432..fc58456a11 100755 --- a/t/t6025-merge-symlinks.sh +++ b/t/t6025-merge-symlinks.sh @@ -33,7 +33,7 @@ git-commit -m b-file' test_expect_success \ 'merge master into b-symlink, which has a different symbolic link' ' git-checkout b-symlink && -! git-merge master' +test_must_fail git-merge master' test_expect_success \ 'the merge result must be a file' ' @@ -42,7 +42,7 @@ test -f symlink' test_expect_success \ 'merge master into b-file, which has a file instead of a symbolic link' ' git-reset --hard && git-checkout b-file && -! git-merge master' +test_must_fail git-merge master' test_expect_success \ 'the merge result must be a file' ' @@ -52,7 +52,7 @@ test_expect_success \ 'merge b-file, which has a file instead of a symbolic link, into master' ' git-reset --hard && git-checkout master && -! git-merge b-file' +test_must_fail git-merge b-file' test_expect_success \ 'the merge result must be a file' ' |