On Wed, May 17, 2017 at 9:09 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> writes:
>
>> On Wed, May 17, 2017 at 7:39 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
>>> From: Marc Stevens <marc@xxxxxxxxxxxxxxx>
>>>
>>> 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