From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Marc Stevens <marc@marc-stevens.nl>,
Michael Kebe <michael.kebe@gmail.com>, Jeff King <peff@peff.net>,
Stefan Beller <sbeller@google.com>,
Brandon Williams <bmwill@google.com>
Subject: Re: [PATCH 2/3] sha1dc: use sha1collisiondetection as a submodule
Date: Thu, 25 May 2017 12:47:31 +0200 [thread overview]
Message-ID: <CACBZZX43Mrv_7W_Eoo9YOB1zV832GibNj_T+KjQ8QZQNVYo7nw@mail.gmail.com> (raw)
In-Reply-To: <xmqqpof3srw4.fsf@gitster.mtv.corp.google.com>
On Sat, May 20, 2017 at 1:13 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
>
>> Replace the forked sha1dc directory with a copy of the upstream code
>> imported as a submodule. This is the exact same code as now exists in
>> the sha1dc/ directory.
>>
>> The initial reason for copy/pasting the code into sha1dc and locally
>> modifying it was that it needed to be altered to work with the git
>> project.
>>
>> The upstream project has accepted my code changes to allow us to use
>> their code as-is, see the preceding commit for details. So import the
>> code as a submodule instead, this will make it easier to keep
>> up-to-date with any upstream fixes or improvements.
>>
>> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
>> ---
>> .gitmodules | 4 ++++
>> Makefile | 4 ++--
>> hash.h | 2 +-
>> sha1collisiondetection | 1 +
>> 4 files changed, 8 insertions(+), 3 deletions(-)
>> create mode 100644 .gitmodules
>> create mode 160000 sha1collisiondetection
>
> I am not sure how prepared our .travis.yml is to deal with a
> submodule, I'd prefer to have this step broken down to two step
> process.
I've since sent a v2 of this which addresses this by being more
careful, but since then I found these Travis docs that seem to
indicate that cloning the submodule will Just Work:
https://docs.travis-ci.com/user/common-build-problems/#Git-Submodules-are-not-updated-correctly
next prev parent reply other threads:[~2017-05-25 10:47 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-18 21:28 [PATCH 0/3] Update sha1dc from upstream & optionally make it a submodule Ævar Arnfjörð Bjarmason
2017-05-18 21:28 ` [PATCH 1/3] sha1dc: update from upstream Ævar Arnfjörð Bjarmason
2017-05-18 21:28 ` [PATCH 2/3] sha1dc: use sha1collisiondetection as a submodule Ævar Arnfjörð Bjarmason
2017-05-20 11:13 ` Junio C Hamano
2017-05-20 11:54 ` [PATCH v2 0/2] Update sha1dc from upstream & optionally make it " Ævar Arnfjörð Bjarmason
2017-05-22 22:27 ` Junio C Hamano
2017-05-22 22:48 ` Stefan Beller
2017-05-23 3:22 ` Junio C Hamano
2017-05-23 10:55 ` Ævar Arnfjörð Bjarmason
2017-05-23 13:06 ` Junio C Hamano
2017-05-25 10:44 ` Ævar Arnfjörð Bjarmason
2017-05-25 23:31 ` Junio C Hamano
2017-05-20 11:54 ` [PATCH v2 1/2] sha1dc: update from upstream Ævar Arnfjörð Bjarmason
2017-05-20 11:54 ` [PATCH v2 2/2] sha1dc: optionally use sha1collisiondetection as a submodule Ævar Arnfjörð Bjarmason
2017-05-22 1:33 ` Junio C Hamano
2017-05-22 2:48 ` Junio C Hamano
2017-05-22 8:27 ` Ævar Arnfjörð Bjarmason
2017-05-22 8:48 ` Junio C Hamano
2017-05-25 10:47 ` Ævar Arnfjörð Bjarmason [this message]
2017-05-18 21:28 ` [PATCH 3/3] sha1dc: remove the unused sha1dc/ directory Ævar Arnfjörð Bjarmason
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CACBZZX43Mrv_7W_Eoo9YOB1zV832GibNj_T+KjQ8QZQNVYo7nw@mail.gmail.com \
--to=avarab@gmail.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=marc@marc-stevens.nl \
--cc=michael.kebe@gmail.com \
--cc=peff@peff.net \
--cc=sbeller@google.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).