git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Lars Schneider <larsxschneider@gmail.com>
Date
Jun 26, 2017, 09:54 UTC
Message-ID
<D0D3C60B-84E3-431B-A600-546ABA1D1209@gmail.com>
In-Reply-To
<87k23zccc2.fsf@gmail.com>
Show 44 quoted lines
> On 26 Jun 2017, at 11:44, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:
> 
> 
> 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.

Do you see some other way to check if this is part of the build? Would it make sense to add this info to "git --version --build-options"?

I am not familiar with the SHA1 machinery... but does it work on macOS even though we generally use APPLE_COMMON_CRYPTO?

- Lars
Previous: Ævar Arnfjörð BjarmasonNext: Junio C Hamano
Message 4 of 6 in “What's cooking in git.git (Jun 2017, #07; Sat, 24)”
  1. Junio C HamanoJun 24, 2017
  2. Lars SchneiderJun 26, 2017
  3. Ævar Arnfjörð BjarmasonJun 26, 2017
  4. Lars SchneiderJun 26, 2017
  5. Junio C HamanoJun 26, 2017
  6. Jonathan TanJun 26, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.