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>
maint
Junio C Hamano 2006-10-27 14:29:55 -07:00
parent 019298015b
commit 36889a5078
5 changed files with 1 additions and 28 deletions

View File

@ -52,13 +52,10 @@ test_expect_success \
'rebase topic branch against new master and check git-am did not get halted' \ 'rebase topic branch against new master and check git-am did not get halted' \
'git-rebase master && test ! -d .dotest' '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' \ 'rebase --merge topic branch that was partially merged upstream' \
'git-checkout -f my-topic-branch-merge && 'git-checkout -f my-topic-branch-merge &&
git-rebase --merge master-merge && git-rebase --merge master-merge &&
test ! -d .git/.dotest-merge' test ! -d .git/.dotest-merge'
fi


test_done test_done

View File

@ -7,12 +7,6 @@ test_description='git rebase --merge test'


. ./test-lib.sh . ./test-lib.sh


if test "$no_python"; then
echo "Skipping: no python => no recursive merge"
test_done
exit 0
fi

T="A quick brown fox T="A quick brown fox
jumps over the lazy dog." jumps over the lazy dog."
for i in 1 2 3 4 5 6 7 8 9 10 for i in 1 2 3 4 5 6 7 8 9 10

View File

@ -10,12 +10,6 @@ test_description='git rebase --merge --skip tests'
# we assume the default git-am -3 --skip strategy is tested independently # we assume the default git-am -3 --skip strategy is tested independently
# and always works :) # and always works :)


if test "$no_python"; then
echo "Skipping: no python => no recursive merge"
test_done
exit 0
fi

test_expect_success setup ' test_expect_success setup '
echo hello > hello && echo hello > hello &&
git add hello && git add hello &&

View File

@ -10,12 +10,6 @@
test_description='Test criss-cross merge' test_description='Test criss-cross merge'
. ./test-lib.sh . ./test-lib.sh


if test "$no_python"; then
echo "Skipping: no python => no recursive merge"
test_done
exit 0
fi

test_expect_success 'prepare repository' \ test_expect_success 'prepare repository' \
'echo "1 'echo "1
2 2

View File

@ -3,12 +3,6 @@
test_description='Merge-recursive merging renames' test_description='Merge-recursive merging renames'
. ./test-lib.sh . ./test-lib.sh


if test "$no_python"; then
echo "Skipping: no python => no recursive merge"
test_done
exit 0
fi

test_expect_success setup \ test_expect_success setup \
' '
cat >A <<\EOF && cat >A <<\EOF &&