X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3403-rebase-skip.sh;h=0a26099658f4307f06fe594feb3fc046ff267076;hb=adf59ec127f447aa83c84f9dbe2ae4e6417f3760;hp=657f68104d52558668119234a0637ac2bca33c0a;hpb=65c6a4696a760f518c9f262705de030323c11146;p=git.git diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh index 657f68104..0a2609965 100755 --- a/t/t3403-rebase-skip.sh +++ b/t/t3403-rebase-skip.sh @@ -31,8 +31,8 @@ test_expect_success setup ' git branch skip-merge skip-reference ' -test_expect_failure 'rebase with git am -3 (default)' ' - git rebase master +test_expect_success 'rebase with git am -3 (default)' ' + ! git rebase master ' test_expect_success 'rebase --skip with am -3' ' @@ -53,7 +53,7 @@ test_expect_success 'rebase moves back to skip-reference' ' test_expect_success 'checkout skip-merge' 'git checkout -f skip-merge' -test_expect_failure 'rebase with --merge' 'git rebase --merge master' +test_expect_success 'rebase with --merge' '! git rebase --merge master' test_expect_success 'rebase --skip with --merge' ' git rebase --skip