summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-03-28 13:52:20 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-28 13:52:20 -0700
commitc34aa34299cac5223e5882d481e958ccbb83f21f (patch)
tree1fa9583a28222634e850c33ff6c041df4bd2f820 /Makefile
parentMerge branch 'jt/perf-updates' into maint (diff)
parentt/interop: add test of old clients against modern git-daemon (diff)
downloadtgif-c34aa34299cac5223e5882d481e958ccbb83f21f.tar.xz
Merge branch 'jk/interop-test' into maint
Picking two versions of Git and running tests to make sure the older one and the newer one interoperate happily has now become possible. * jk/interop-test: t/interop: add test of old clients against modern git-daemon t: add an interoperability test harness
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index ca9f16d19a..d5454ca336 100644
--- a/Makefile
+++ b/Makefile
@@ -2249,6 +2249,9 @@ endif
ifdef GIT_PERF_MAKE_OPTS
@echo GIT_PERF_MAKE_OPTS=\''$(subst ','\'',$(subst ','\'',$(GIT_PERF_MAKE_OPTS)))'\' >>$@+
endif
+ifdef GIT_INTEROP_MAKE_OPTS
+ @echo GIT_INTEROP_MAKE_OPTS=\''$(subst ','\'',$(subst ','\'',$(GIT_INTEROP_MAKE_OPTS)))'\' >>$@+
+endif
ifdef TEST_GIT_INDEX_VERSION
@echo TEST_GIT_INDEX_VERSION=\''$(subst ','\'',$(subst ','\'',$(TEST_GIT_INDEX_VERSION)))'\' >>$@+
endif