X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3403-rebase-skip.sh;h=0a26099658f4307f06fe594feb3fc046ff267076;hb=adf59ec127f447aa83c84f9dbe2ae4e6417f3760;hp=2ee5a00ea794e31946ee3228bc66ecc8e7d3b38f;hpb=761e8566cb072047e836f1d7f50d3c0f67d7eb00;p=git.git diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh index 2ee5a00ea..0a2609965 100755 --- a/t/t3403-rebase-skip.sh +++ b/t/t3403-rebase-skip.sh @@ -31,12 +31,11 @@ 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' ' - git reset --hard HEAD && git rebase --skip ' @@ -54,10 +53,9 @@ 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 reset --hard HEAD && git rebase --skip '