undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a second testcase for handling invalid strategies in git-merge

Browse Source 
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>
This commit is contained in:
Miklos Vajna 2008-07-30 01:17:01 +02:00 committed by Junio C Hamano
parent 1b1d78fe77
commit dce61e728b
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/t7600-merge.sh
View File

@ -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 &&