Merge branch 'jc/merge-msg' into next

diff --git a/t/Makefile b/t/Makefile
index 5c5a62012673eaa7eec76da0068606bc78311fbd..ba6ddbec976f2ea0e4808d6549f93270e0c2b676 100644 (file)
--- a/t/Makefile
+++ b/t/Makefile
@@ -15,6 +15,10 @@ shellquote = '$(call shq,$(1))'
 
 T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
 
+ifdef NO_PYTHON
+       GIT_TEST_OPTS += --no-python
+endif
+
 all: $(T) clean
 
 $(T):