notes: add tests for --commit/--abort/--strategy exclusivity

Add new tests to ensure that --commit, --abort, and --strategy are
mutually exclusive.

Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jacob Keller 2015-08-17 14:33:32 -07:00 коммит произвёл Junio C Hamano
Родитель 93efcad317
Коммит 11dd2b2e9a
1 изменённых файлов: 12 добавлений и 0 удалений

Просмотреть файл

@ -314,6 +314,18 @@ y and z notes on 1st commit
EOF
test_expect_success 'do not allow mixing --commit and --abort' '
test_must_fail git notes merge --commit --abort
'
test_expect_success 'do not allow mixing --commit and --strategy' '
test_must_fail git notes merge --commit --strategy theirs
'
test_expect_success 'do not allow mixing --abort and --strategy' '
test_must_fail git notes merge --abort --strategy theirs
'
test_expect_success 'finalize conflicting merge (z => m)' '
# Resolve conflicts and finalize merge
cat >.git/NOTES_MERGE_WORKTREE/$commit_sha1 <<EOF &&