From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Marc Stevens" <marc@marc-stevens.nl>,
"Michael Kebe" <michael.kebe@gmail.com>,
"Jeff King" <peff@peff.net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH/RFC 0/3] Use sha1collisiondetection as a submodule
Date: Wed, 17 May 2017 11:38:21 +0000 [thread overview]
Message-ID: <20170517113824.31700-1-avarab@gmail.com> (raw)
In-Reply-To: <xmqqk25gvu12.fsf@gitster.mtv.corp.google.com>
On Wed, May 17, 2017 at 9:09 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
>
>> On Wed, May 17, 2017 at 7:39 AM, Junio C Hamano <gitster@pobox.com> wrote:
>>> From: Marc Stevens <marc@marc-stevens.nl>
>>>
>>> Some big-endian platforms define _BIG_ENDIAN, which the test at the
>>> beginning of file has missed. Also, when the input is not aligned,
>>> some platforms trigger SIGBUS.
>>>
>>> This change corresponds to 33a694a9 ("Fix issues with a big endian
>>> platform", 2017-05-15) in the history of the upstream repository
>>> https://github.com/cr-marcstevens/sha1collisiondetection
>>
>> Then why not just update sha1dc from upstream instead of
>> cherry-picking one patch from them?
>
> See the original message upthread. I did the cherry-pick simply
> because that was what Marc instructed the patch recipient to do ;-).
Since that patch is now in Marc's upstream code we can just update to
that.
While we're at it let's see if Marc will take a patch so that we can
use his code as-is with some Makefile trickery of our own, instead of
having to solve merge conflicts each time we update from him. I'll
submit a pull request for that shortly.
And since if and when that pull request gets accepted we're at the
point of being able to use the upstream code as-is & don't need to
locally modify it, we can just use a submodule to track it.
Ævar Arnfjörð Bjarmason (3):
sha1dc: update from my fork of upstream
sha1dc: use sha1collisiondetection as a submodule
sha1dc: remove our old copy of the sha1dc code
.gitmodules | 4 +
Makefile | 13 +-
hash.h | 2 +-
sha1collisiondetection | 1 +
sha1dc/LICENSE.txt | 30 -
sha1dc/sha1.c | 1809 ------------------------------------------------
sha1dc/sha1.h | 122 ----
sha1dc/ubc_check.c | 363 ----------
sha1dc/ubc_check.h | 44 --
sha1dc_git.c | 19 +
sha1dc_git.h | 14 +
11 files changed, 49 insertions(+), 2372 deletions(-)
create mode 100644 .gitmodules
create mode 160000 sha1collisiondetection
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
create mode 100644 sha1dc_git.c
create mode 100644 sha1dc_git.h
--
2.13.0.303.g4ebf302169
next prev parent reply other threads:[~2017-05-17 11:38 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-15 12:49 Git 2.13.0 segfaults on Solaris SPARC due to DC_SHA1=YesPlease being on by default Ævar Arnfjörð Bjarmason
2017-05-15 13:58 ` Marc Stevens
2017-05-15 14:13 ` Ævar Arnfjörð Bjarmason
2017-05-15 22:09 ` Jeff King
2017-06-01 14:03 ` demerphq
[not found] ` <CAKKM46vwM9pxyMxTc4jA0z_8vGKdDGCGg9ziKkFAsqr5ULYJxA@mail.gmail.com>
[not found] ` <007001d2cd88$2b916180$82b42480$@marc-stevens.nl>
2017-05-16 5:43 ` Michael Kebe
2017-05-17 5:39 ` [PATCH] sha1dc: fix issues with a big endian platform Junio C Hamano
2017-05-17 6:30 ` Ævar Arnfjörð Bjarmason
2017-05-17 7:09 ` Junio C Hamano
2017-05-17 11:38 ` Ævar Arnfjörð Bjarmason [this message]
2017-05-17 18:52 ` [PATCH/RFC 0/3] Use sha1collisiondetection as a submodule Stefan Beller
2017-05-17 19:45 ` Ævar Arnfjörð Bjarmason
2017-05-17 19:57 ` Stefan Beller
2017-05-18 0:11 ` Brandon Williams
2017-05-17 11:38 ` [PATCH/RFC 1/3] sha1dc: update from my fork of upstream Ævar Arnfjörð Bjarmason
2017-05-17 11:38 ` [PATCH/RFC 2/3] sha1dc: use sha1collisiondetection as a submodule Ævar Arnfjörð Bjarmason
2017-05-17 15:26 ` [PATCH] sha1dc: fix issues with a big endian platform Johannes Schindelin
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=20170517113824.31700-1-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=marc@marc-stevens.nl \
--cc=michael.kebe@gmail.com \
--cc=peff@peff.net \
/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).