Skip to content

Commit cac87dc

Browse files
gitstergitster
committed
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 <gitster@pobox.com> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 86cfd61 commit cac87dc

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

‎Makefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -989,6 +989,10 @@ EXTLIBS =
989989

990990
GIT_USER_AGENT = git/$(GIT_VERSION)
991991

992+
ifeq ($(wildcard sha1collisiondetection/lib/sha1.h),sha1collisiondetection/lib/sha1.h)
993+
DC_SHA1_SUBMODULE = auto
994+
endif
995+
992996
include config.mak.uname
993997
-include config.mak.autogen
994998
-include config.mak

0 commit comments

Comments
 (0)