Makefile: under "make dist", include the sha1collisiondetection submodule

Include the sha1collisiondetection submodule when running "make dist". Even though we've been shipping the sha1collisiondetection submodule[1] and using it by default if it's checked out[2] anyone downloading git as a tarball would just get an empty sha1collisiondetection/ directory. Doing this automatically is a feature that's missing from git-archive, but in the meantime let's bundle this up into the tarball we ship. This ensures that the DC_SHA1_SUBMODULE flag does what's intended even in an unpacked tarball, and more importantly means we're building the exact same code from the same paths from git.git and from the tarball. I am not including all the files in the submodule, only the ones git actually needs (and the licenses), only including some files like this would be a useful feature if git-archive ever adds the ability to bundle up submodules. 1. commit 86cfd61e6b ("sha1dc: optionally use sha1collisiondetection as a submodule", 2017-07-01) 2. cac87dc01d ("sha1collisiondetection: automatically enable when submodule is populated", 2017-07-01) Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Dec 8, 2017 at 22:29 UTC bc2ed316e409df22af1cfc5fe1fa8b18a6a7311d
1 file changed +15
Makefile
+15
@@ -2642,6 +2642,21 @@ dist: git-archive$(X) configure
2642 $(GIT_TARNAME)/configure \
2643 $(GIT_TARNAME)/version \
2644 $(GIT_TARNAME)/git-gui/version
2645 +ifdef DC_SHA1_SUBMODULE
2646 + @mkdir -p $(GIT_TARNAME)/sha1collisiondetection/lib
2647 + @cp sha1collisiondetection/LICENSE.txt \
2648 + $(GIT_TARNAME)/sha1collisiondetection/
2649 + @cp sha1collisiondetection/LICENSE.txt \
2650 + $(GIT_TARNAME)/sha1collisiondetection/
2651 + @cp sha1collisiondetection/lib/sha1.[ch] \
2652 + $(GIT_TARNAME)/sha1collisiondetection/lib/
2653 + @cp sha1collisiondetection/lib/ubc_check.[ch] \
2654 + $(GIT_TARNAME)/sha1collisiondetection/lib/
2655 + $(TAR) rf $(GIT_TARNAME).tar \
2656 + $(GIT_TARNAME)/sha1collisiondetection/LICENSE.txt \
2657 + $(GIT_TARNAME)/sha1collisiondetection/lib/sha1.[ch] \
2658 + $(GIT_TARNAME)/sha1collisiondetection/lib/ubc_check.[ch]
2659 +endif
2660 @$(RM) -r $(GIT_TARNAME)
2661 gzip -f -9 $(GIT_TARNAME).tar
2662