diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh
index 8ab63c52765d6608dba3b4fcf0b80833af240a67..977c498f00f2d8e2066bd586130ee84fe1a196a3 100755 (executable)
--- a/t/t3403-rebase-skip.sh
+++ b/t/t3403-rebase-skip.sh
# we assume the default git-am -3 --skip strategy is tested independently
# and always works :)
# 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 &&
test_expect_success setup '
echo hello > hello &&
git add hello &&
git branch skip-merge skip-reference
'
git branch skip-merge skip-reference
'
-test_expect_failure 'rebase with git am -3 (default)' 'git rebase master'
+test_expect_failure 'rebase with git am -3 (default)' '
+ git rebase master
+'
test_expect_success 'rebase --skip with am -3' '
git reset --hard HEAD &&
test_expect_success 'rebase --skip with am -3' '
git reset --hard HEAD &&