X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3403-rebase-skip.sh;h=0d33c71daa557e68268dfb2279a02fe2afca1ed7;hb=bb0d283989ec8853ffd72dfb26ff557ffa7781e4;hp=0a26099658f4307f06fe594feb3fc046ff267076;hpb=30c0312fd182942c10421e77d2b3ec6284cc0468;p=git.git diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh index 0a2609965..0d33c71da 100755 --- a/t/t3403-rebase-skip.sh +++ b/t/t3403-rebase-skip.sh @@ -32,7 +32,7 @@ test_expect_success setup ' ' test_expect_success 'rebase with git am -3 (default)' ' - ! git rebase master + test_must_fail git rebase master ' test_expect_success 'rebase --skip with am -3' ' @@ -43,7 +43,7 @@ test_expect_success 'rebase moves back to skip-reference' ' test refs/heads/skip-reference = $(git symbolic-ref HEAD) && git branch post-rebase && git reset --hard pre-rebase && - ! git rebase master && + test_must_fail git rebase master && echo "hello" > hello && git add hello && git rebase --continue && @@ -53,7 +53,9 @@ test_expect_success 'rebase moves back to skip-reference' ' test_expect_success 'checkout skip-merge' 'git checkout -f skip-merge' -test_expect_success 'rebase with --merge' '! git rebase --merge master' +test_expect_success 'rebase with --merge' ' + test_must_fail git rebase --merge master +' test_expect_success 'rebase --skip with --merge' ' git rebase --skip