diff options
| author | Johannes Sixt <johannes.sixt@telecom.at> | 2008-07-16 08:33:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-16 21:27:09 (GMT) |
| commit | 01941bd54387aee029315d565f0bc1a5b9c5541a (patch) | |
| tree | 30edfa04139fdaf54692e312744dbaf36ab1f85c /t/t7600-merge.sh | |
| parent | f66cf96d7c613a8129436a5d76ef7b74ee302436 (diff) | |
| download | git-01941bd54387aee029315d565f0bc1a5b9c5541a.zip git-01941bd54387aee029315d565f0bc1a5b9c5541a.tar.gz git-01941bd54387aee029315d565f0bc1a5b9c5541a.tar.bz2 | |
t7600-merge: Use test_expect_failure to test option parsing
It used plain 'if git merge ...', which hides a segfault. The test does not pass.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7600-merge.sh')
| -rwxr-xr-x | t/t7600-merge.sh | 36 |
1 files changed, 6 insertions, 30 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index d21cd29..daf45b7 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -222,36 +222,12 @@ test_expect_success 'setup' ' test_debug 'gitk --all' test_expect_success 'test option parsing' ' - if git merge -$ c1 - then - echo "[OOPS] -$ accepted" - false - fi && - if git merge --no-such c1 - then - echo "[OOPS] --no-such accepted" - false - fi && - if git merge -s foobar c1 - then - echo "[OOPS] -s foobar accepted" - false - fi && - if git merge -s=foobar c1 - then - echo "[OOPS] -s=foobar accepted" - false - fi && - if git merge -m - then - echo "[OOPS] missing commit msg accepted" - false - fi && - if git merge - then - echo "[OOPS] missing commit references accepted" - false - fi + test_must_fail git merge -$ c1 && + test_must_fail git merge --no-such c1 && + test_must_fail git merge -s foobar c1 && + test_must_fail git merge -s=foobar c1 && + test_must_fail git merge -m && + test_must_fail git merge ' test_expect_success 'merge c0 with c1' ' |