Here's v2 as promised. Comments per-patch.
Ævar Arnfjörð Bjarmason (5):
Makefile: don't error out under DC_SHA1_EXTERNAL if
DC_SHA1_SUBMODULE=auto
Fixed indenting.
Makefile: under "make dist", include the sha1collisiondetection
submodule
NEW: Change "make dist" to include the sha1collisiondetection/ dir in
the tarball Junio's going to build when he makes releases, right now
we just ship an empty directory.
sha1dc_git.h: re-arrange an ifdef chain for a subsequent change
No changes, trivial rewording of commit message.
Makefile: use the sha1collisiondetection submodule by default
s/NO_DC_SHA1_SUBMODULE=UnfortunatelyYes/NO_DC_SHA1_SUBMODULE=NoThanks/
as requested by Junio.
Fix up wording of comment describing NO_DC_SHA1_SUBMODULE
Fix indenting.
sha1dc: remove in favor of using sha1collisiondetection as a submodule
Reword & expand commit message.
Don't die if both NO_DC_SHA1_SUBMODULE=Y and DC_SHA1_EXTERNAL=Y are provided.
Makefile | 42 +-
sha1dc/.gitattributes | 1 -
sha1dc/LICENSE.txt | 30 -
sha1dc/sha1.c | 1900 -------------------------------------------------
sha1dc/sha1.h | 110 ---
sha1dc/ubc_check.c | 372 ----------
sha1dc/ubc_check.h | 52 --
sha1dc_git.h | 6 +-
8 files changed, 27 insertions(+), 2486 deletions(-)
delete mode 100644 sha1dc/.gitattributes
delete mode 100644 sha1dc/LICENSE.txt
delete mode 100644 sha1dc/sha1.c
delete mode 100644 sha1dc/sha1.h
delete mode 100644 sha1dc/ubc_check.c
delete mode 100644 sha1dc/ubc_check.h
--
2.15.1.424.g9478a66081
