X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Ft6022-merge-rename.sh;h=a2d24b5ca95d971eccbb913c2a0eb84b7e87cd10;hb=6858d494926437ad7b7e9199ea39953eb90c7bab;hp=1292cafd7f1f7fc30b462d4e07be34383e9d6be9;hpb=90768daaa006516c7ae69ed89d7c2e67243dfac1;p=git.git

diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
index 1292cafd..a2d24b5c 100755
--- a/t/t6022-merge-rename.sh
+++ b/t/t6022-merge-rename.sh
@@ -3,6 +3,12 @@
 test_description='Merge-recursive merging renames'
 . ./test-lib.sh
 
+if test "$no_python"; then
+	echo "Skipping: no python => no recursive merge"
+	test_done
+	exit 0
+fi
+
 test_expect_success setup \
 '
 cat >A <<\EOF &&