diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-16 17:10:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-16 17:10:28 -0700 |
| commit | 88bbda08d7b9503862a8fb8846d78c67825e5e3d (patch) | |
| tree | 1eb8c68123ee29f1eb1ade9065041d8009ab95dc /t/t7600-merge.sh | |
| parent | dd33927ccdb92205988ba98bb2bb7df47529cd6d (diff) | |
| parent | 473a189b92b70295157d20fe229d44824061c79f (diff) | |
| download | git-88bbda08d7b9503862a8fb8846d78c67825e5e3d.tar.gz | |
Merge branch 'maint'
* maint:
Start preparing 1.5.6.4 release notes
git fetch-pack: do not complain about "no common commits" in an empty repo
rebase-i: keep old parents when preserving merges
t7600-merge: Use test_expect_failure to test option parsing
Fix buffer overflow in prepare_attr_stack
Fix buffer overflow in git diff
Fix buffer overflow in git-grep
git-cvsserver: fix call to nonexistant cleanupWorkDir()
Documentation/git-cherry-pick.txt et al.: Fix misleading -n description
Conflicts:
RelNotes
Diffstat (limited to 't/t7600-merge.sh')
| -rwxr-xr-x | t/t7600-merge.sh | 38 |
1 files changed, 7 insertions, 31 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index d4cf6289a4..9ab5bdacc4 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -221,37 +221,13 @@ 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_expect_failure 'test option parsing' ' + 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' ' |