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

Re: [PATCH 2/3] sha1dc: use sha1collisiondetection as a submodule

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
May 25, 2017, 10:47 UTC
Message-ID
<CACBZZX43Mrv_7W_Eoo9YOB1zV832GibNj_T+KjQ8QZQNVYo7nw@mail.gmail.com>
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:
Show 28 quoted lines
> Æ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

Previous: Junio C HamanoNext: Ævar Arnfjörð Bjarmason
Message 19 of 20 in “Update sha1dc from upstream & optionally make it a submodule”
  1. 0/3 Update sha1dc from upstream & optionally make it a submoduleÆvar Arnfjörð Bjarmason, May 18, 2017
  2. 1/3 sha1dc: update from upstreamÆvar Arnfjörð Bjarmason, May 18, 2017
  3. 2/3 sha1dc: use sha1collisiondetection as a submoduleÆvar Arnfjörð Bjarmason, May 18, 2017
  4. Junio C HamanoMay 20, 2017
  5. 0/2 Update sha1dc from upstream & optionally make it a submoduleÆvar Arnfjörð Bjarmason, May 20, 2017
  6. 1/2 sha1dc: update from upstreamÆvar Arnfjörð Bjarmason, May 20, 2017
  7. 2/2 sha1dc: optionally use sha1collisiondetection as a submoduleÆvar Arnfjörð Bjarmason, May 20, 2017
  8. Junio C HamanoMay 22, 2017
  9. Junio C HamanoMay 22, 2017
  10. Ævar Arnfjörð BjarmasonMay 22, 2017
  11. Junio C HamanoMay 22, 2017
  12. Junio C HamanoMay 22, 2017
  13. Stefan BellerMay 22, 2017
  14. Junio C HamanoMay 23, 2017
  15. Ævar Arnfjörð BjarmasonMay 23, 2017
  16. Junio C HamanoMay 23, 2017
  17. Ævar Arnfjörð BjarmasonMay 25, 2017
  18. Junio C HamanoMay 25, 2017
  19. Ævar Arnfjörð BjarmasonMay 25, 2017
  20. 3/3 sha1dc: remove the unused sha1dc/ directoryÆvar Arnfjörð Bjarmason, May 18, 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.