提交 36889a50 编写于 作者: J Junio C Hamano

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: NJunio C Hamano <junkio@cox.net>
上级 01929801
......@@ -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
......@@ -7,12 +7,6 @@ test_description='git rebase --merge test'
. ./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
jumps over the lazy dog."
for i in 1 2 3 4 5 6 7 8 9 10
......
......@@ -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 &&
......
......@@ -10,12 +10,6 @@
test_description='Test criss-cross merge'
. ./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' \
'echo "1
2
......
......@@ -3,12 +3,6 @@
test_description='Merge-recursive merging renames'
. ./test-lib.sh
if test "$no_python"; then
echo "Skipping: no python => no recursive merge"
test_done
exit 0
fi
test_expect_success setup \
'
cat >A <<\EOF &&
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册