Skip to content

SHA1DC fixes & fully moving to a git.git submodule

Ævar Arnfjörð Bjarmason git 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest4 of 5 patches 8 repliesIn review
  2. v13 of 4 patches 10 repliesSuperseded

4 of 5 patches are in this archive. The cover letter announces 5.

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/5Makefile: don't error out under DC_SHA1_EXTERNAL if DC_SHA1_SUBMODULE=autoMakefile+2 -00 replies
2/5Makefile: under "make dist", include the sha1collisiondetection submoduleMakefile+15 -03 replies
3/5sha1dc_git.h: re-arrange an ifdef chain for a subsequent changesha1dc_git.h+3 -30 replies
4/5Makefile: use the sha1collisiondetection submodule by defaultMakefile sha1dc_git.h+21 -154 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 0/5] SHA1DC fixes & fully moving to a git.git submodule

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
Signature · 1 line
2.15.1.424.g9478a66081