Merge branch 'ab/sha1dc-build' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 8 Feb 2018 23:08:24 +0000 (15:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 Feb 2018 23:08:24 +0000 (15:08 -0800)
Push the submodule version of collision-detecting SHA-1 hash
implementation a bit harder on builders.

* ab/sha1dc-build:
sha1dc_git.h: re-arrange an ifdef chain for a subsequent change
Makefile: under "make dist", include the sha1collisiondetection submodule
Makefile: don't error out under DC_SHA1_EXTERNAL if DC_SHA1_SUBMODULE=auto

1  2 
Makefile
diff --cc Makefile
Simple merge