mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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:
parent
93efcad317
commit
11dd2b2e9a
|
@ -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 &&
|
||||
|
|
Loading…
Reference in a new issue