From: Junio C Hamano <redacted>
Date: Fri, 24 Mar 2017 20:07:38 +0000 (-0700)
Subject: Merge branch 'jk/sha1dc'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=48b3693d3cec7bd7996b1394a8df901d1fc26320;p=git.git

Merge branch 'jk/sha1dc'

The "detect attempt to create collisions" variant of SHA-1
implementation by Marc Stevens (CWI) and Dan Shumow (Microsoft)
has been integrated and made the default.

* jk/sha1dc:
  Makefile: make DC_SHA1 the default
  t0013: add a basic sha1 collision detection test
  Makefile: add DC_SHA1 knob
  sha1dc: disable safe_hash feature
  sha1dc: adjust header includes for git
  sha1dc: add collision-detecting sha1 implementation
---

48b3693d3cec7bd7996b1394a8df901d1fc26320