summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-03-17 20:50:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-17 20:50:24 (GMT)
commit0bb80ab090fadc99d3d19d23209ddfb7e4f54b3d (patch)
tree5fea17cdffbdfbfdb39c16b0f07ffdeb0495a7cb /Makefile
parent94c9b5af703eb70adba349cfbfaaa3029849744c (diff)
parentbd4d9d993c1202615178f86a947a5c63e706860f (diff)
downloadgit-0bb80ab090fadc99d3d19d23209ddfb7e4f54b3d.zip
git-0bb80ab090fadc99d3d19d23209ddfb7e4f54b3d.tar.gz
git-0bb80ab090fadc99d3d19d23209ddfb7e4f54b3d.tar.bz2
Merge branch 'jk/interop-test'
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 ed68700..ba524f3 100644
--- a/Makefile
+++ b/Makefile
@@ -2251,6 +2251,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