| commit | a66b51c624d9d8700b57646322d23231d01b9be8 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 15 Feb 2018 22:55:40 +0000 (15 14:55 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 15 Feb 2018 22:55:40 +0000 (15 14:55 -0800) | ||
| tree | 0ddd267f3602a6065ef5c0b55a1079f461a7b121 | treesnapshot (tar.gz zip) |
| parent | b2e45c695d09f6a31ce09347ae0a5d2cdfe9dd4e | commitdiff |
| parent | aa9b3b25c68804a96075b233f5b5e0f17ba3e3e2 | commitdiff |
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
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
| Makefile | diff1 | diff2 | blobhistory |