From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 8 Feb 2018 23:08:24 +0000 (-0800)
Subject: Merge branch 'ab/sha1dc-build' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ba9ff2b8367a22f7922db4675ec0d9aff46c406d

Merge branch 'ab/sha1dc-build' into next

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
---

ba9ff2b8367a22f7922db4675ec0d9aff46c406d