Re: What's cooking in git.git (Jun 2017, #07; Sat, 24)

From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Jun 26, 2017, 09:44 UTC
Message-ID: <87k23zccc2.fsf@gmail.com>
In-Reply-To: <BDD05B04-C845-43B5-8E22-D215403D2A6E@gmail.com>

On Mon, Jun 26 2017, Lars Schneider jotted:

Show 28 quoted lines

>> On 25 Jun 2017, at 01:25, Junio C Hamano <gitster@pobox.com> wrote:
>
>> ...
>
>> * ab/sha1dc (2017-06-07) 2 commits
>> - sha1collisiondetection: automatically enable when submodule is populated
>> - sha1dc: optionally use sha1collisiondetection as a submodule
>>
>> The "collission-detecting" implementation of SHA-1 hash we borrowed
>> from is replaced by directly binding the upstream project as our
>> submodule.
>>
>> Will keep in 'pu'.
>> cf. <xmqqefuab571.fsf@gitster.mtv.corp.google.com>
>>
>> The only nit I may have is that we may possibly want to turn this
>> on in .travis.yml on MacOS before we move it forward (otherwise
>> we'd be shipping bundled one and submodule one without doing any
>> build on that platform)?  Other than that, the topic seems ready to
>> be merged down.
>
> What do you mean by "turn this on in .travis.qml on MacOS"?
> The submodule is already cloned on all platforms on Travis:
> https://travis-ci.org/git/git/jobs/246965294#L25-L27
>
> However, I think DC_SHA1_SUBMODULE (or even DC_SHA1) is not enabled
> on any platform right now. Should we enable it on all platforms or
> add a new build job that enables/tests these flags?

If we're cloning the submodule, which from this output, and AFAIK in general happens with all Travis builds, but correct me if I'm wrong we'll set DC_SHA1_SUBMODULE=auto due to this bit in the Makefile:

    ifeq ($(wildcard sha1collisiondetection/lib/sha1.h),sha1collisiondetection/lib/sha1.h)
    DC_SHA1_SUBMODULE = auto
    endif

So if (and I think this is the case) Travis just does a clone with --recurse-submodules then this is already being CI'd.