From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Jul 2017 20:42:51 +0000 (-0700)
Subject: Merge branch 'ab/sha1dc'
X-Git-Tag: v2.14.0-rc0~20
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2db87328ef8246b7dbca90563fecc1e67c6274e6

Merge branch 'ab/sha1dc'

The "collission-detecting" implementation of SHA-1 hash we borrowed
from is replaced by directly binding the upstream project as our
submodule.  Glitches on minority platforms are still being worked out.

* ab/sha1dc:
sha1collisiondetection: automatically enable when submodule is populated
sha1dc: optionally use sha1collisiondetection as a submodule
---

2db87328ef8246b7dbca90563fecc1e67c6274e6