git-svn: avoid printing filenames of files we're not tracking

[git.git] / t / t6022-merge-rename.sh

diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
index a2d24b5ca95d971eccbb913c2a0eb84b7e87cd10..497ef36ad883e79cd799a4642e0c4414d8550e1c 100755 (executable)
--- a/t/t6022-merge-rename.sh
+++ b/t/t6022-merge-rename.sh
@@ -3,12 +3,6 @@
 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 &&
@@ -111,6 +105,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 && {