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/t7610-mergetool.sh | |
| parent | 5a26973025bce74782571844c7b8091d1cd7c405 (diff) | |
| download | git-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/t7610-mergetool.sh')
| -rwxr-xr-x | t/t7610-mergetool.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index 6b0483f3e..9285071c4 100755 --- a/t/t7610-mergetool.sh +++ b/t/t7610-mergetool.sh @@ -35,7 +35,7 @@ test_expect_success 'custom mergetool' ' git config mergetool.mytool.cmd "cat \"\$REMOTE\" >\"\$MERGED\"" && git config mergetool.mytool.trustExitCode true && git checkout branch1 && - ! git merge master >/dev/null 2>&1 && + test_must_fail git merge master >/dev/null 2>&1 && ( yes "" | git mergetool file1>/dev/null 2>&1 ) && ( yes "" | git mergetool file2>/dev/null 2>&1 ) && test "$(cat file1)" = "master updated" && |