Default GIT_MERGE_VERBOSITY to 5 during tests.

diff --git a/t/Makefile b/t/Makefile
index fe65f53c5fbcf07bb69214b0f0cff8aef551e906..19e38508a70708b78de6467df71ed36373999d6a 100644 (file)
--- a/t/Makefile
+++ b/t/Makefile
@@ -11,19 +11,21 @@ TAR ?= $(TAR)
 SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
 
 T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
-
-ifdef NO_PYTHON
-       GIT_TEST_OPTS += --no-python
-endif
+TSVN = $(wildcard t91[0-9][0-9]-*.sh)
 
 all: $(T) clean
 
 $(T):
-       @echo "*** $@ ***"; '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
+       @echo "*** $@ ***"; GIT_CONFIG=.git/config '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
 
 clean:
        rm -fr trash
 
+# we can test NO_OPTIMIZE_COMMITS independently of LC_ALL
+full-svn-test:
+       $(MAKE) $(TSVN) GIT_SVN_NO_OPTIMIZE_COMMITS=1 LC_ALL=C
+       $(MAKE) $(TSVN) GIT_SVN_NO_OPTIMIZE_COMMITS=0 LC_ALL=en_US.UTF-8
+
 .PHONY: $(T) clean
-.NOPARALLEL:
+.NOTPARALLEL: