X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3403-rebase-skip.sh;h=eab053c3e0e1cbe82bc7824d43109ba56acdb54d;hb=d60a6a662fac58f833efde93c962314fd5d83541;hp=bb2531536160bb0a6510cc316d8d74a1da2312e7;hpb=284fe4beb6b4835ef6857cd56b34c70c1d12b14d;p=git.git

diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh
index bb2531536..eab053c3e 100755
--- a/t/t3403-rebase-skip.sh
+++ b/t/t3403-rebase-skip.sh
@@ -10,12 +10,6 @@ test_description='git rebase --merge --skip tests'
 # we assume the default git-am -3 --skip strategy is tested independently
 # and always works :)
 
-if test "$no_python"; then
-	echo "Skipping: no python => no recursive merge"
-	test_done
-	exit 0
-fi
-
 test_expect_success setup '
 	echo hello > hello &&
 	git add hello &&
@@ -55,9 +49,8 @@ test_expect_success 'rebase --skip with --merge' '
 	'
 
 test_expect_success 'merge and reference trees equal' \
-	'test -z "`git-diff-tree skip-merge skip-reference`"'
+	'test -z "`git diff-tree skip-merge skip-reference`"'
 
 test_debug 'gitk --all & sleep 1'
 
 test_done
-