From: Junio C Hamano Date: Sat, 1 Jul 2017 22:05:47 +0000 (+0000) Subject: sha1collisiondetection: automatically enable when submodule is populated X-Git-Tag: v2.14.0-rc0~20^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cac87dc01d30ed8fc00f5b872a7ee7804f7b9ffa;hp=86cfd61e6bc12745751c43b4f69886b290cd85cb;p=thirdparty%2Fgit.git sha1collisiondetection: automatically enable when submodule is populated If a user wants to experiment with the version of collision detecting sha1 from the submodule, the user needed to not just populate the submodule but also needed to turn the knob. A Makefile trick is easy enough to do so, so let's do this. When somebody with a copy of the submodule populated wants not to use it, that can be done by overriding it in config.mak or from the command line. Signed-off-by: Junio C Hamano Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- diff --git a/Makefile b/Makefile index 6baad1669e..8d33936a12 100644 --- a/Makefile +++ b/Makefile @@ -989,6 +989,10 @@ EXTLIBS = GIT_USER_AGENT = git/$(GIT_VERSION) +ifeq ($(wildcard sha1collisiondetection/lib/sha1.h),sha1collisiondetection/lib/sha1.h) +DC_SHA1_SUBMODULE = auto +endif + include config.mak.uname -include config.mak.autogen -include config.mak