diff options
Diffstat (limited to 'third_party/git/t/t3422-rebase-incompatible-options.sh')
| -rwxr-xr-x | third_party/git/t/t3422-rebase-incompatible-options.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/third_party/git/t/t3422-rebase-incompatible-options.sh b/third_party/git/t/t3422-rebase-incompatible-options.sh index 50e7960702..a5868ea152 100755 --- a/third_party/git/t/t3422-rebase-incompatible-options.sh +++ b/third_party/git/t/t3422-rebase-incompatible-options.sh @@ -76,4 +76,14 @@ test_expect_success REBASE_P \ test_must_fail git rebase --preserve-merges --rebase-merges A ' +test_expect_success '--rebase-merges incompatible with --strategy' ' + git checkout B^0 && + test_must_fail git rebase --rebase-merges -s resolve A +' + +test_expect_success '--rebase-merges incompatible with --strategy-option' ' + git checkout B^0 && + test_must_fail git rebase --rebase-merges -Xignore-space-change A +' + test_done |