From abb7c7b31c0896bd838bbb6437b310db5a42227a Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sat, 18 Feb 2006 13:01:18 +0100 Subject: Optionally work without python In some setups (notably server setups) you do not need that dependency. Gracefully handle the absence of python when NO_PYTHON is defined. Signed-off-by: Johannes E. Schindelin Signed-off-by: Junio C Hamano --- t/t6021-merge-criss-cross.sh | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 't/t6021-merge-criss-cross.sh') diff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh index e8606c751..262381379 100755 --- a/t/t6021-merge-criss-cross.sh +++ b/t/t6021-merge-criss-cross.sh @@ -10,6 +10,12 @@ 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 -- cgit v1.2.1