X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3401-rebase-partial.sh;h=8b19d3ccea5a0d5ff697661202347fbdfc6c330a;hb=d77ee72662a821d66ae218056f0103eb24d8d4b4;hp=360a67060e1d1fd501fed7729712213360c456b2;hpb=b296990c3bcf942dc7601b31a901c7714a353a0a;p=git.git diff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh index 360a67060..8b19d3cce 100755 --- a/t/t3401-rebase-partial.sh +++ b/t/t3401-rebase-partial.sh @@ -52,13 +52,10 @@ test_expect_success \ 'rebase topic branch against new master and check git-am did not get halted' \ 'git-rebase master && test ! -d .dotest' -if test -z "$no_python" -then - test_expect_success \ +test_expect_success \ 'rebase --merge topic branch that was partially merged upstream' \ 'git-checkout -f my-topic-branch-merge && git-rebase --merge master-merge && test ! -d .git/.dotest-merge' -fi test_done