X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Ft6022-merge-rename.sh;h=5ac25647abd366f04867a5acec6a987f314c2ace;hb=288c0384505e6c25cc1a162242919a0485d50a74;hp=1292cafd7f1f7fc30b462d4e07be34383e9d6be9;hpb=78ff5cf6b5595fa3ae291fa9ee3595b7c7cc624a;p=git.git

diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
index 1292cafd..5ac25647 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 &&
@@ -105,6 +111,7 @@ test_expect_success 'pull renaming branch into unrenaming one' \
 
 test_expect_success 'pull renaming branch into another renaming one' \
 '
+	rm -f B
 	git reset --hard
 	git checkout red
 	git pull . white && {