diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-02-18 13:01:18 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-18 23:16:09 -0800 |
| commit | abb7c7b31c0896bd838bbb6437b310db5a42227a (patch) | |
| tree | ca184974f14d8cd61e1a7c25173edcae17c9e7cb /t/t6021-merge-criss-cross.sh | |
| parent | 289c4b36e336af5266b86d924ef0aa828e8e4841 (diff) | |
| download | git-abb7c7b31c0896bd838bbb6437b310db5a42227a.tar.gz git-abb7c7b31c0896bd838bbb6437b310db5a42227a.tar.xz | |
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 <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t6021-merge-criss-cross.sh')
| -rwxr-xr-x | t/t6021-merge-criss-cross.sh | 6 |
1 files changed, 6 insertions, 0 deletions
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 |