From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Takashi Iwai" <tiwai@suse.de>, "Jeff King" <peff@peff.net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 0/4] SHA1DC fixes & fully moving to a git.git submodule
Date: Tue, 28 Nov 2017 21:32:10 +0000 [thread overview]
Message-ID: <20171128213214.12477-1-avarab@gmail.com> (raw)
We've now had a couple of Git releases where we've used
sha1collisiondetection/ if it's checked out, but have gracefully
fallen back on sha1dc/ if it's not there.
This series makes it a hard requirement, without 4/4 you'll still be
able to do NO_DC_SHA1_SUBMODULE=UnfortunatelyYes, but with it even the
ability to do that is removed, i.e. we're fully on the submodule
(unless you have it as an external library).
1/4 should be destined straight for inclusion since it's a bugfix to
the existing logic, and 2/4 could tag along with it, but none of this
is urgent, so I'd figured I'd sent it all as one series and see what
people think.
Ævar Arnfjörð Bjarmason (4):
Makefile: don't error out under DC_SHA1_EXTERNAL if
DC_SHA1_SUBMODULE=auto
sha1dc_git.h: re-arrange an ifdef chain for a subsequent change
Makefile: use the sha1collisiondetection submodule by default
sha1dc: remove in favor of using sha1collisiondetection as a submodule
Makefile | 29 +-
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, 14 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.0.403.gc27cc4dac6
next reply other threads:[~2017-11-28 21:32 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-28 21:32 Ævar Arnfjörð Bjarmason [this message]
2017-11-28 21:32 ` [PATCH 1/4] Makefile: don't error out under DC_SHA1_EXTERNAL if DC_SHA1_SUBMODULE=auto Ævar Arnfjörð Bjarmason
2017-12-05 6:53 ` Jeff King
2017-11-28 21:32 ` [PATCH 2/4] sha1dc_git.h: re-arrange an ifdef chain for a subsequent change Ævar Arnfjörð Bjarmason
2017-12-05 6:55 ` Jeff King
2017-11-28 21:32 ` [PATCH 3/4] Makefile: use the sha1collisiondetection submodule by default Ævar Arnfjörð Bjarmason
2017-12-05 7:02 ` Jeff King
2017-12-05 10:22 ` Ævar Arnfjörð Bjarmason
2017-12-05 13:08 ` Junio C Hamano
2017-12-05 14:16 ` Ævar Arnfjörð Bjarmason
2017-12-09 12:30 ` Kevin Daudt
2017-12-09 12:53 ` Kevin Daudt
2017-12-05 16:32 ` Junio C Hamano
[not found] ` <20171128213214.12477-5-avarab@gmail.com>
2017-12-05 7:10 ` [PATCH 4/4] sha1dc: remove in favor of using sha1collisiondetection as a submodule Jeff King
2017-12-08 22:29 ` [PATCH v2 0/5] SHA1DC fixes & fully moving to a git.git submodule Ævar Arnfjörð Bjarmason
2017-12-09 13:08 ` Kevin Daudt
2017-12-08 22:29 ` [PATCH v2 1/5] Makefile: don't error out under DC_SHA1_EXTERNAL if DC_SHA1_SUBMODULE=auto Ævar Arnfjörð Bjarmason
2017-12-08 22:29 ` [PATCH v2 2/5] Makefile: under "make dist", include the sha1collisiondetection submodule Ævar Arnfjörð Bjarmason
2017-12-08 22:48 ` Junio C Hamano
2017-12-08 23:15 ` Ævar Arnfjörð Bjarmason
2017-12-19 19:10 ` Junio C Hamano
2017-12-08 22:29 ` [PATCH v2 3/5] sha1dc_git.h: re-arrange an ifdef chain for a subsequent change Ævar Arnfjörð Bjarmason
2017-12-08 22:30 ` [PATCH v2 4/5] Makefile: use the sha1collisiondetection submodule by default Ævar Arnfjörð Bjarmason
2017-12-08 22:53 ` Junio C Hamano
2017-12-08 23:21 ` Junio C Hamano
2017-12-09 0:31 ` Jeff King
2017-12-08 23:30 ` Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171128213214.12477-1-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).