git@vger.kernel.org mailing list mirror (one of many)
 help / Atom feed
From: Stefan Beller <sbeller@google.com>
To: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>, Marc Stevens <marc@marc-stevens.nl>, Michael Kebe <michael.kebe@gmail.com>, Jeff King <peff@peff.net>
Subject: Re: [PATCH/RFC 0/3] Use sha1collisiondetection as a submodule
Date: Wed, 17 May 2017 11:52:12 -0700
Message-ID: <CAGZ79kZC98CxA69QjmX2s_SU6z1CSgKgwZeqvwiMRAQc6+S3xg@mail.gmail.com> (raw)
In-Reply-To: <20170517113824.31700-1-avarab@gmail.com>

On Wed, May 17, 2017 at 4:38 AM, Ævar Arnfjörð Bjarmason
<avarab@gmail.com> wrote:
> 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.

As someone who works on submodules: YAY! This sounds
wonderful in the sense that more git developers experience the
sharp edges (if any) of submodules and would fix them.

With the reset work on submodules (checkout, reset,
ls-files, grep) and more in the works (better push/pull)
we may be close to prime time.

However we do distribute tarballs (well, Junio does),
which is not yet supported to include submodules.

I did follow the SHA1DC discussion just from the sideline,
how crucial is that library for us?

Also now that we discuss having submodules:
Would we just point the submodule URL to github\
and call it a day?

We could make a friendly fork of it and put it next to all the repositories
of https://git-blame.blogspot.com/p/git-public-repositories.html
and then use relative URLs in the .gitmodules file.

On a tangent, in an off-list discussion we discussed having
the git-annex tests as an optional submodule instead of an
"external" test, but in conclusion we considered that idea not
ideal to implement (because our tests are like contracts, we should
actually write our own tests and not rely on downstream to write
tests for us)

looking forward for a discussion here,
Stefan

  reply index

Thread overview: 17+ messages in thread (expand / 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
2017-05-17 18:52                   ` Stefan Beller [this message]
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             ` Johannes Schindelin

Reply instructions:

You may reply publically 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 to all the recipients using the --to, --cc,
  and --in-reply-to switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAGZ79kZC98CxA69QjmX2s_SU6z1CSgKgwZeqvwiMRAQc6+S3xg@mail.gmail.com \
    --to=sbeller@google.com \
    --cc=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

git@vger.kernel.org mailing list mirror (one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/
       or Tor2web: https://www.tor2web.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox