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>
Junio C Hamano committed
Oct 27, 2006 at 14:29 UTC
36889a5078767be8cc0189c10d235dda327c6a30
5 files changed
+1
-28
t/t3401-rebase-partial.sh
+1
-4
@@ -52,13 +52,10 @@ test_expect_success \
52
'rebase topic branch against new master and check git-am did not get halted' \
53
'git-rebase master && test ! -d .dotest'
54
55
-if test -z "$no_python"
56
-then
57
- test_expect_success \
55
+test_expect_success \
56
'rebase --merge topic branch that was partially merged upstream' \
57
'git-checkout -f my-topic-branch-merge &&
58
git-rebase --merge master-merge &&
59
test ! -d .git/.dotest-merge'
62
-fi
60
61
test_done
t/t3402-rebase-merge.sh
-6
@@ -7,12 +7,6 @@ test_description='git rebase --merge test'
7
8
. ./test-lib.sh
9
10
-if test "$no_python"; then
11
- echo "Skipping: no python => no recursive merge"
12
- test_done
13
- exit 0
14
-fi
15
-
10
T="A quick brown fox
11
jumps over the lazy dog."
12
for i in 1 2 3 4 5 6 7 8 9 10
t/t3403-rebase-skip.sh
-6
@@ -10,12 +10,6 @@ test_description='git rebase --merge --skip tests'
10
# we assume the default git-am -3 --skip strategy is tested independently
11
# and always works :)
12
13
-if test "$no_python"; then
14
- echo "Skipping: no python => no recursive merge"
15
- test_done
16
- exit 0
17
-fi
18
-
13
test_expect_success setup '
14
echo hello > hello &&
15
git add hello &&
t/t6021-merge-criss-cross.sh
-6
@@ -10,12 +10,6 @@
10
test_description='Test criss-cross merge'
11
. ./test-lib.sh
12
13
-if test "$no_python"; then
14
- echo "Skipping: no python => no recursive merge"
15
- test_done
16
- exit 0
17
-fi
18
-
13
test_expect_success 'prepare repository' \
14
'echo "1
15
2
t/t6022-merge-rename.sh
-6
@@ -3,12 +3,6 @@
3
test_description='Merge-recursive merging renames'
4
. ./test-lib.sh
5
6
-if test "$no_python"; then
7
- echo "Skipping: no python => no recursive merge"
8
- test_done
9
- exit 0
10
-fi
11
-
6
test_expect_success setup \
7
'
8
cat >A <<\EOF &&