On Tue, Jun 6, 2017 at 9:01 PM, Jeff King <peff@xxxxxxxx> wrote: > On Tue, Jun 06, 2017 at 08:51:35PM +0200, Ævar Arnfjörð Bjarmason wrote: > >> On Tue, Jun 6, 2017 at 8:23 PM, Stefan Beller <sbeller@xxxxxxxxxx> wrote: >> > On Tue, Jun 6, 2017 at 8:12 AM, Ævar Arnfjörð Bjarmason >> > <avarab@xxxxxxxxx> 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. > > Agreed. Maybe we'd also want this patch: Great, that makes perfect sense for prepending to the series. > -- >8 -- > Subject: sha1dc: ignore indent-with-non-tab whitespace violations > > The upstream sha1dc code indents some lines with spaces. > While this doesn't match Git's coding guidelines, it's better > to leave this imported code untouched than to try to make it > match our style. However, we can use .gitattributes to tell > "diff --check" and "git am" not to bother us about it. > > Signed-off-by: Jeff King <peff@xxxxxxxx> > --- > sha1dc/.gitattributes | 1 + > 1 file changed, 1 insertion(+) > create mode 100644 sha1dc/.gitattributes > > diff --git a/sha1dc/.gitattributes b/sha1dc/.gitattributes > new file mode 100644 > index 000000000..da53f4054 > --- /dev/null > +++ b/sha1dc/.gitattributes > @@ -0,0 +1 @@ > +* whitespace=-indent-with-non-tab > -- > 2.13.1.664.g1b5a21ec3 >