summaryrefslogtreecommitdiff
path: root/t/t7600-merge.sh
diff options
context:
space:
mode:
authorChris Packham <judge.packham@gmail.com>2016-12-14 08:37:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-12-14 18:02:04 (GMT)
commit042e290da6aee0a9f21cd5890ccf231c266e177e (patch)
tree7056cb718d62c88dc75614b7f8b1a3c263bab346 /t/t7600-merge.sh
parentc261a87e704679203510d48ff4db7bc7006b8a5a (diff)
downloadgit-042e290da6aee0a9f21cd5890ccf231c266e177e.zip
git-042e290da6aee0a9f21cd5890ccf231c266e177e.tar.gz
git-042e290da6aee0a9f21cd5890ccf231c266e177e.tar.bz2
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 <judge.packham@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7600-merge.sh')
-rwxr-xr-xt/t7600-merge.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 682139c..2ebda50 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