diff options
| author |  Miklos Vajna <vmiklos@frugalware.org> | 2008-07-30 01:17:01 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-07-29 23:21:36 -0700 |
| commit | dce61e728b89611109e76cbc9fa897fe49d7869d (patch) | |
| tree | 56aef9a5e3c6e0ccf525361d02fcd39de5decfdf /t/t7600-merge.sh | |
| parent | Add a new test for using a custom merge strategy (diff) | |
| download | tgif-dce61e728b89611109e76cbc9fa897fe49d7869d.tar.xz | |
Add a second testcase for handling invalid strategies in git-merge
This one tests '-s index' which is interesting because git-merge-index
is an existing git command but it is not a valid strategy.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7600-merge.sh')
| -rwxr-xr-x | t/t7600-merge.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 5eeb6c2b27..0329aee2cd 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -230,6 +230,10 @@ test_expect_success 'test option parsing' ' test_must_fail git merge ' +test_expect_success 'reject non-strategy with a git-merge-foo name' ' + test_must_fail git merge -s index c1 +' + test_expect_success 'merge c0 with c1' ' git reset --hard c0 && git merge c1 && |