X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=t%2Ft3407-rebase-abort.sh;h=a6a6c40a98512b190f8610391aa153a294e4b5cb;hb=53b742522c3ae56726e679b50feede849ec46362;hp=e573dc845b3d72004b2a96f344528c68977c52e1;hpb=34df9fe36a3627e1c2a9ae244820fb61e3891b90;p=git.git diff --git a/t/t3407-rebase-abort.sh b/t/t3407-rebase-abort.sh index e573dc845..a6a6c40a9 100755 --- a/t/t3407-rebase-abort.sh +++ b/t/t3407-rebase-abort.sh @@ -84,6 +84,16 @@ testrebase() { test_cmp reflog_before reflog_after && rm reflog_before reflog_after ' + + test_expect_success 'rebase --abort can not be used with other options' ' + cd "$work_dir" && + # Clean up the state from the previous one + git reset --hard pre-rebase && + test_must_fail git rebase$type master && + test_must_fail git rebase -v --abort && + test_must_fail git rebase --abort -v && + git rebase --abort + ' } testrebase "" .git/rebase-apply