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>, Jeff King <peff@peff.net>, Michael Kebe <michael.kebe@gmail.com>, "Liam R . Howlett" <Liam.Howlett@oracle.com>, Adam Dinwoodie <adam@dinwoodie.org>
Subject: Re: [PATCH 2/3] sha1dc: optionally use sha1collisiondetection as a submodule
Date: Tue, 27 Jun 2017 11:46:27 -0700
Message-ID: <CAGZ79kYzZqAm9AgiXAanBTzJfHStebCy9Z6MvhniRjS3s1wG-Q@mail.gmail.com> (raw)
In-Reply-To: <20170627121718.12078-3-avarab@gmail.com>

On Tue, Jun 27, 2017 at 5:17 AM, Ævar Arnfjörð Bjarmason
<avarab@gmail.com> wrote:
> Add an option to use the sha1collisiondetection library from the
> submodule in sha1collisiondetection/ instead of in the copy in the
> sha1dc/ directory.
>
> This allows us to try out the submodule in sha1collisiondetection
> without breaking the build for anyone who's not expecting them as we
> work out any kinks.
>
> This uses my own fork which integrates PR #36. See the preceding
> commit ("sha1dc: update from my PR #36", 2017-06-27) for details.
>

> +++ b/.gitmodules
> @@ -0,0 +1,4 @@
> +[submodule "sha1collisiondetection"]
> +       path = sha1collisiondetection
> +       url = https://github.com/avar/sha1collisiondetection.git
> +       branch = bigend-detect-solaris-again

What is the motivation for the branch field here?
While this series fixes a hot issue, in the long run we'd rather
want to plug in the original upstream with the master branch?

  reply index

Thread overview: 63+ messages in thread (expand / mbox.gz / Atom feed / [top])
     [not found] <20170606124323.GD25777@dinwoodie.org>
     [not found] ` <20170606151231.25172-1-avarab@gmail.com>
2017-06-06 15:12   ` Ævar Arnfjörð Bjarmason
2017-06-06 18:48     ` Stefan Beller
2017-06-06 19:03       ` Ævar Arnfjörð Bjarmason
2017-06-06 19:09         ` Stefan Beller
2017-06-26  7:32 Compile Error v2.13.2 on Solaris SPARC Michael Kebe
     [not found] ` <87lgofcf7r.fsf@gmail.com>
2017-06-26 12:36   ` Michael Kebe
2017-06-26 12:47     ` Ævar Arnfjörð Bjarmason
2017-06-26 14:00       ` Michael Kebe
2017-06-26 18:31         ` Ævar Arnfjörð Bjarmason
2017-06-26 18:29       ` Liam R. Howlett
     [not found] ` <87fuem7aw2.fsf@gmail.com>
2017-06-27  5:41   ` Michael Kebe
2017-06-27  6:28     ` Michael Kebe
2017-06-27 16:28       ` Liam R. Howlett
2017-06-27 17:38         ` Junio C Hamano
2017-06-27 18:29           ` Liam R. Howlett
2017-06-27 18:55             ` Ævar Arnfjörð Bjarmason
2017-06-27 17:59         ` Ævar Arnfjörð Bjarmason
2017-06-27 12:17 ` [PATCH 0/3] update sha1dc from PR #36 Ævar Arnfjörð Bjarmason
2017-06-27 18:37   ` Stefan Beller
2017-06-27 20:33   ` [PATCH v2 " Ævar Arnfjörð Bjarmason
2017-06-27 21:37     ` Junio C Hamano
2017-06-27 21:38     ` Junio C Hamano
2017-06-27 22:24       ` Ævar Arnfjörð Bjarmason
2017-06-28 21:42       ` Ævar Arnfjörð Bjarmason
2017-06-28 22:02         ` Junio C Hamano
2017-06-27 20:33   ` [PATCH v2 1/3] sha1dc: correct endian detection for Solaris (and others?) Ævar Arnfjörð Bjarmason
2017-06-27 20:33   ` [PATCH v2 2/3] sha1dc: optionally use sha1collisiondetection as a submodule Ævar Arnfjörð Bjarmason
2017-06-27 20:33   ` [PATCH v2 3/3] sha1collisiondetection: automatically enable when submodule is populated Ævar Arnfjörð Bjarmason
2017-07-01 22:05   ` [PATCH v3 0/3] Update sha1dc from upstream Ævar Arnfjörð Bjarmason
2017-07-01 22:05   ` [PATCH v3 1/3] sha1dc: update " Ævar Arnfjörð Bjarmason
2017-07-01 22:05   ` [PATCH v3 2/3] sha1dc: optionally use sha1collisiondetection as a submodule Ævar Arnfjörð Bjarmason
2017-07-03 17:11     ` Junio C Hamano
2017-07-03 20:29       ` Ævar Arnfjörð Bjarmason
2017-07-04 17:26         ` Junio C Hamano
2017-07-04 22:50           ` Ævar Arnfjörð Bjarmason
2017-07-05  0:36             ` Stefan Beller
2017-07-05  1:56               ` Junio C Hamano
2017-07-05 17:46                 ` Stefan Beller
2017-07-05 18:03                   ` Ævar Arnfjörð Bjarmason
2017-07-01 22:05   ` [PATCH v3 3/3] sha1collisiondetection: automatically enable when submodule is populated Ævar Arnfjörð Bjarmason
2017-06-27 12:17 ` [PATCH 1/3] sha1dc: update from my PR #36 Ævar Arnfjörð Bjarmason
2017-06-27 15:22   ` Junio C Hamano
2017-06-27 15:53     ` Junio C Hamano
2017-06-27 18:07       ` Ævar Arnfjörð Bjarmason
2017-06-27 15:55     ` Junio C Hamano
2017-06-27 16:31       ` Liam R. Howlett
2017-06-27 18:11       ` Ævar Arnfjörð Bjarmason
2017-06-27 19:10         ` Junio C Hamano
2017-06-27 19:33           ` Junio C Hamano
2017-06-27 19:35           ` Ævar Arnfjörð Bjarmason
2017-06-27 19:38             ` Junio C Hamano
2017-06-27 19:38           ` Liam R. Howlett
2017-06-27 19:48             ` Junio C Hamano
2017-06-27 18:06     ` Ævar Arnfjörð Bjarmason
2017-06-27 18:12       ` Junio C Hamano
2017-06-27 18:19         ` Ævar Arnfjörð Bjarmason
2017-06-27 20:17           ` Junio C Hamano
2017-06-27 18:23       ` Junio C Hamano
2017-06-27 18:52         ` Ævar Arnfjörð Bjarmason
2017-06-27 12:17 ` [PATCH 2/3] sha1dc: optionally use sha1collisiondetection as a submodule Ævar Arnfjörð Bjarmason
2017-06-27 18:46   ` Stefan Beller [this message]
2017-06-27 18:56     ` Ævar Arnfjörð Bjarmason
2017-06-27 12:17 ` [PATCH 3/3] sha1collisiondetection: automatically enable when submodule is populated Ævar Arnfjörð Bjarmason

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=CAGZ79kYzZqAm9AgiXAanBTzJfHStebCy9Z6MvhniRjS3s1wG-Q@mail.gmail.com \
    --to=sbeller@google.com \
    --cc=Liam.Howlett@oracle.com \
    --cc=adam@dinwoodie.org \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --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