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

Re: [PATCH 0/3] update sha1dc

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
Jun 6, 2017, 18:51 UTC
Message-ID
<CACBZZX485+W99mRspDTf09LjP-C26PaAi+vNSBkW_aVyXAsQJg@mail.gmail.com>
In-Reply-To
<CAGZ79kaaRsUBAxRKLPxjuk=oRrw2zBdoHWd9iNDmTbY9MpqN-w@mail.gmail.com>
On Tue, Jun 6, 2017 at 8:23 PM, Stefan Beller <sbeller@google.com> wrote:
Show 19 quoted lines
> On Tue, Jun 6, 2017 at 8:12 AM, Ævar Arnfjörð Bjarmason
> <avarab@gmail.com> wrote:
>> This updates sha1dc fixing the issue on Cygwin introduced in 2.13.1,
>> and hopefully not regressing elsewhere. Liam, it would be much
>> appreciated if you could test this on SPARC.
>>
>> As before the "sha1dc: update from upstream" patch is what should
>> fast-track to master/maint and be in 2.13.2, the other two are the
>> cooking submodule use, that's all unchanged aside from of course the
>> submodule pointing to the same upstream commit as the code import
>> itself does.
>>
>> Junio: There's a whitespace change to sha1.h that am warns about, but
>> which it applies anyway that you didn't apply from my previous
>> patch. I think it probably makes sense to just take upstream's
>> whitespace shenanigans as-is instead of seeing that diff every time we
>> update. I guess we could also send them a pull request...
>
> I would suggest the pull request.

Looking at this again it's not a bug, just upstream choosing to indent a comment with spaces, not a bug.

So it makes sense to just apply as-is so we don't have that diff with them / different sha1s on the files etc.

Show 5 quoted lines
> Also as to not make the mistake from before that I jump on the
> submodule bandwagon here:
> Patch 1 ought to go in its on series/patch, so with that out the way
> we have more time to consider the pros and cons of the rest of
> the series?

Yes it makes perfect sense to just take the 1st patch here and make the submodule changes cook. This is just how I submitted it the last time and Junio took the 1st patch into a maint topic, so I figured I'd send it like this again.

Previous: Stefan BellerNext: Jeff King
Message 21 of 26 in “Git v2.13.1 SHA1 very broken”
  1. Adam DinwoodieJun 5, 2017
  2. Ævar Arnfjörð BjarmasonJun 5, 2017
  3. Ramsay JonesJun 5, 2017
  4. Ramsay JonesJun 6, 2017
  5. Junio C HamanoJun 6, 2017
  6. Adam DinwoodieJun 6, 2017
  7. Junio C HamanoJun 6, 2017
  8. Adam DinwoodieJun 6, 2017
  9. Continous Integration (was: RE: Git v2.13.1 SHA1 very broken)Jason Pyeron, Jun 6, 2017
  10. Lars SchneiderJun 6, 2017
  11. Adam DinwoodieJul 2, 2017
  12. Johannes SchindelinJul 3, 2017
  13. 0/3 update sha1dcÆvar Arnfjörð Bjarmason, Jun 6, 2017
  14. 1/3 sha1dc: update from upstreamÆvar Arnfjörð Bjarmason, Jun 6, 2017
  15. 2/3 sha1dc: optionally use sha1collisiondetection as a submoduleÆvar Arnfjörð Bjarmason, Jun 6, 2017
  16. Stefan BellerJun 6, 2017
  17. Ævar Arnfjörð BjarmasonJun 6, 2017
  18. Stefan BellerJun 6, 2017
  19. 3/3 sha1collisiondetection: automatically enable when submodule is populatedÆvar Arnfjörð Bjarmason, Jun 6, 2017
  20. Stefan BellerJun 6, 2017
  21. Ævar Arnfjörð BjarmasonJun 6, 2017
  22. sha1dc: ignore indent-with-non-tab whitespace violationsJeff King, Jun 6, 2017
  23. Ævar Arnfjörð BjarmasonJun 6, 2017
  24. Stefan BellerJun 6, 2017
  25. Liam R. HowlettJun 13, 2017
  26. Morten WelinderJun 6, 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.