diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-11-20 00:49:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-21 20:55:39 -0800 |
| commit | 7cdbff14d4823c3a3d64c2011ab0b23f794efef8 (patch) | |
| tree | 14d84fbaf70277d8ba833391c03860e98c1defe7 /t/test-lib.sh | |
| parent | 594270635732d6320d6e6d7fa127679ae90ef5b1 (diff) | |
| download | git-7cdbff14d4823c3a3d64c2011ab0b23f794efef8.tar.gz | |
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/test-lib.sh')
| -rwxr-xr-x | t/test-lib.sh | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index 3895f16709..ac7be769b4 100755 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -76,7 +76,8 @@ do -v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose) verbose=t; shift ;; --no-python) - no_python=t; shift ;; + # noop now... + shift ;; *) break ;; esac @@ -210,18 +211,6 @@ GIT_EXEC_PATH=$(pwd)/.. HOME=$(pwd)/trash export PATH GIT_EXEC_PATH HOME -# Similarly use ../compat/subprocess.py if our python does not -# have subprocess.py on its own. -PYTHON=`sed -e '1{ - s/^#!// - q -}' ../git-merge-recursive-old` || { - error "You haven't built things yet, have you?" -} -"$PYTHON" -c 'import subprocess' 2>/dev/null || { - PYTHONPATH=$(pwd)/../compat - export PYTHONPATH -} GITPERLLIB=$(pwd)/../perl/blib/lib:$(pwd)/../perl/blib/arch/auto/Git export GITPERLLIB test -d ../templates/blt || { |