diff options
| author |  Chris Packham <judge.packham@gmail.com> | 2016-12-14 21:37:57 +1300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-12-14 10:02:04 -0800 |
| commit | 042e290da6aee0a9f21cd5890ccf231c266e177e (patch) | |
| tree | 7056cb718d62c88dc75614b7f8b1a3c263bab346 /t | |
| parent | completion: add --continue option for merge (diff) | |
| download | tgif-042e290da6aee0a9f21cd5890ccf231c266e177e.tar.xz | |
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')
| -rwxr-xr-x | t/t7600-merge.sh | 2 |
1 files changed, 2 insertions, 0 deletions
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 |