All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Lars Schneider <larsxschneider@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
	Git Users <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (Jun 2017, #07; Sat, 24)
Date: Mon, 26 Jun 2017 11:44:45 +0200	[thread overview]
Message-ID: <87k23zccc2.fsf@gmail.com> (raw)
In-Reply-To: <BDD05B04-C845-43B5-8E22-D215403D2A6E@gmail.com>


On Mon, Jun 26 2017, Lars Schneider jotted:

>> 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.

  reply	other threads:[~2017-06-26  9:45 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-24 23:25 What's cooking in git.git (Jun 2017, #07; Sat, 24) Junio C Hamano
2017-06-26  8:29 ` Lars Schneider
2017-06-26  9:44   ` Ævar Arnfjörð Bjarmason [this message]
2017-06-26  9:54     ` Lars Schneider
2017-06-26 15:49       ` Junio C Hamano
2017-06-26 16:55 ` Jonathan Tan

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87k23zccc2.fsf@gmail.com \
    --to=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=larsxschneider@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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.