Re: [PATCH 0/2] Re-integrate sha1dc

2017-03-17 Thread Jeff King
On Thu, Mar 16, 2017 at 10:22:12PM -0700, Junio C Hamano wrote: > My .travis.yml suggestion was about testing with SHA1DC in > preparation for making it the default. That would give us another > incentive to keep an eye on its performance, too, before we make it > the default in Makefile, at whic

Re: [PATCH 0/2] Re-integrate sha1dc

2017-03-16 Thread Junio C Hamano
Jeff King writes: > On Thu, Mar 16, 2017 at 03:23:59PM -0700, Junio C Hamano wrote: > >> I am wondering if we should queue another one for .travis.yml on top >> to force use of USE_SHA1DC=YesPlease during the tests. I expect >> that we'd be encouraging its use for ordinary users without any >> s

Re: [PATCH 0/2] Re-integrate sha1dc

2017-03-16 Thread Jeff King
On Thu, Mar 16, 2017 at 03:23:59PM -0700, Junio C Hamano wrote: > I am wondering if we should queue another one for .travis.yml on top > to force use of USE_SHA1DC=YesPlease during the tests. I expect > that we'd be encouraging its use for ordinary users without any > specific needs in the releas

Re: [PATCH 0/2] Re-integrate sha1dc

2017-03-16 Thread Linus Torvalds
On Thu, Mar 16, 2017 at 3:04 PM, Jeff King wrote: > > There are a few things I think are worth changing. The die() message > should mention the sha1 we computed. That will be a big help if an old > version of git tries to unknowingly push a colliding object to a newer > version. The user will see

Re: [PATCH 0/2] Re-integrate sha1dc

2017-03-16 Thread Junio C Hamano
Jeff King writes: > On Thu, Mar 16, 2017 at 06:04:56PM -0400, Jeff King wrote: > >> So here's my version. It's on top of the hash.h tweak, as well. >> >> [1/5]: add collision-detecting sha1 implementation >> [2/5]: sha1dc: adjust header includes for git >> [3/5]: sha1dc: disable safe_hash

Re: [PATCH 0/2] Re-integrate sha1dc

2017-03-16 Thread Jeff King
On Thu, Mar 16, 2017 at 06:04:56PM -0400, Jeff King wrote: > So here's my version. It's on top of the hash.h tweak, as well. > > [1/5]: add collision-detecting sha1 implementation > [2/5]: sha1dc: adjust header includes for git > [3/5]: sha1dc: disable safe_hash feature > [4/5]: Makefile:

Re: [PATCH 0/2] Re-integrate sha1dc

2017-03-16 Thread Jeff King
On Thu, Mar 16, 2017 at 01:24:02PM -0700, Linus Torvalds wrote: > I suspect the first patch will not make it to the list since it's over > 100kB in size, but oh well.. Junio and Jeff will see it. Yep, it didn't make it, but I got it. > It "WorksForMe(tm)" and the integration patches are now fai

[PATCH 0/2] Re-integrate sha1dc

2017-03-16 Thread Linus Torvalds
I suspect the first patch will not make it to the list since it's over 100kB in size, but oh well.. Junio and Jeff will see it. This is sent as two patches, just to have the original upstream code as a first step, and then the second patch does the small modifications to integrate it with git.