Merge branch 'js/ignore-submodule'

diff --git a/t/Makefile b/t/Makefile
index 19e38508a70708b78de6467df71ed36373999d6a..c6a60ab165b504393d3ecd5db1ea9d241687be05 100644 (file)
--- a/t/Makefile
+++ b/t/Makefile
@@ -6,6 +6,7 @@
 #GIT_TEST_OPTS=--verbose --debug
 SHELL_PATH ?= $(SHELL)
 TAR ?= $(TAR)
+RM ?= rm -f
 
 # Shell quote;
 SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
@@ -19,7 +20,7 @@ $(T):
        @echo "*** $@ ***"; GIT_CONFIG=.git/config '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
 
 clean:
-       rm -fr trash
+       $(RM) -r 'trash directory'
 
 # we can test NO_OPTIMIZE_COMMITS independently of LC_ALL
 full-svn-test:
@@ -28,4 +29,3 @@ full-svn-test:
 
 .PHONY: $(T) clean
 .NOTPARALLEL:
-