From 042e290da6aee0a9f21cd5890ccf231c266e177e Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Wed, 14 Dec 2016 21:37:57 +1300 Subject: merge: ensure '--abort' option takes no arguments Like '--continue', the '--abort' option doesn't make any sense with other options or arguments to 'git merge' so ensure that none are present. Signed-off-by: Chris Packham Signed-off-by: Junio C Hamano --- t/t7600-merge.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 't/t7600-merge.sh') diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 682139c4ea..2ebda509ac 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -154,6 +154,8 @@ test_expect_success 'test option parsing' ' 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 --abort foobar && + test_must_fail git merge --abort --quiet && test_must_fail git merge --continue foobar && test_must_fail git merge --continue --quiet && test_must_fail git merge -- cgit v1.2.3