diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-27 14:29:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-27 14:29:55 -0700 |
| commit | 36889a5078767be8cc0189c10d235dda327c6a30 (patch) | |
| tree | 84275b41ab53dd6b81bbf2cab25f70d221989be1 /t/t3401-rebase-partial.sh | |
| parent | 019298015bb7c826b72f2573047b7221b0921fd3 (diff) | |
| download | git-36889a5078767be8cc0189c10d235dda327c6a30.tar.gz git-36889a5078767be8cc0189c10d235dda327c6a30.tar.xz | |
tests: merge-recursive is usable without Python
Many tests still protected themselves with $no_python; there is no need
to do so anymore.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t3401-rebase-partial.sh')
| -rwxr-xr-x | t/t3401-rebase-partial.sh | 5 |
1 files changed, 1 insertions, 4 deletions
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 |