From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Feb 2018 22:55:40 +0000 (-0800)
Subject: Merge branch 'ab/sha1dc-build'
X-Git-Tag: v2.17.0-rc0~102
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a66b51c624d9d8700b57646322d23231d01b9be8;p=thirdparty%2Fgit.git

Merge branch 'ab/sha1dc-build'

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

a66b51c624d9d8700b57646322d23231d01b9be8