aboutsummaryrefslogtreecommitdiff
path: root/t/t0000-basic.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-11-20 00:49:31 -0800
committerJunio C Hamano <junkio@cox.net>2006-11-21 20:55:39 -0800
commit7cdbff14d4823c3a3d64c2011ab0b23f794efef8 (patch)
tree14d84fbaf70277d8ba833391c03860e98c1defe7 /t/t0000-basic.sh
parent594270635732d6320d6e6d7fa127679ae90ef5b1 (diff)
downloadgit-7cdbff14d4823c3a3d64c2011ab0b23f794efef8.tar.gz
git-7cdbff14d4823c3a3d64c2011ab0b23f794efef8.tar.xz
remove merge-recursive-old
This frees the Porcelain-ish that comes with the core Python-free. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t0000-basic.sh')
-rwxr-xr-xt/t0000-basic.sh14
1 files changed, 4 insertions, 10 deletions
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 6aff0b808..81f3bedc9 100755
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -20,10 +20,10 @@ modification *should* take notice and update the test vectors here.
################################################################
# It appears that people are getting bitten by not installing
-# 'merge' (usually part of RCS package in binary distributions)
-# or have too old python without subprocess. Check them and error
-# out before running any tests. Also catch the bogosity of trying
-# to run tests without building while we are at it.
+# 'merge' (usually part of RCS package in binary distributions).
+# Check this and error out before running any tests. Also catch
+# the bogosity of trying to run tests without building while we
+# are at it.
../git >/dev/null
if test $? != 1
@@ -42,12 +42,6 @@ fi
. ./test-lib.sh
-test "$no_python" || "$PYTHON" -c 'import subprocess' || {
- echo >&2 'Your python seem to lack "subprocess" module.
-Please check INSTALL document.'
- exit 1
-}
-
################################################################
# init-db has been done in an empty repository.
# make sure it is empty.