git@vger.kernel.org mailing list mirror (one of many)
 help / Atom feed
From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Stefan Beller <sbeller@google.com>, "git@vger.kernel.org" <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>, Adam Dinwoodie <adam@dinwoodie.org>, Ramsay Jones <ramsay@ramsayjones.plus.com>, "Liam R . Howlett" <Liam.Howlett@oracle.com>, Michael Kebe <michael.kebe@gmail.com>
Subject: Re: [PATCH] sha1dc: ignore indent-with-non-tab whitespace violations
Date: Tue, 6 Jun 2017 21:04:58 +0200
Message-ID: <CACBZZX4FsGHha_Nuw=Tbw86Ghh5Mm7ocbmVXNVS7iXnGWT0bdQ@mail.gmail.com> (raw)
In-Reply-To: <20170606190111.xm4nzvjhbpsw3qbg@sigill.intra.peff.net>

On Tue, Jun 6, 2017 at 9:01 PM, Jeff King <peff@peff.net> 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@google.com> wrote:
>> > 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.
>
> 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@peff.net>
> ---
>  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
>

  reply index

Thread overview: 26+ messages in thread (expand / mbox.gz / Atom feed / [top])
2017-06-05 20:34 Git v2.13.1 SHA1 very broken Adam Dinwoodie
2017-06-05 21:05 ` Ævar Arnfjörð Bjarmason
2017-06-05 23:20   ` Ramsay Jones
2017-06-06  0:11     ` Ramsay Jones
2017-06-06  1:20   ` Junio C Hamano
2017-06-06 10:03     ` Adam Dinwoodie
2017-06-06 11:55       ` Junio C Hamano
2017-06-06 12:43         ` Adam Dinwoodie
2017-06-06 14:47           ` Continous Integration (was: RE: Git v2.13.1 SHA1 very broken) Jason Pyeron
2017-06-06 15:04             ` Lars Schneider
2017-07-02 20:35               ` Adam Dinwoodie
2017-07-03 12:34                 ` Johannes Schindelin
2017-06-06 15:12           ` [PATCH 0/3] update sha1dc Ævar Arnfjörð Bjarmason
2017-06-06 15:12             ` [PATCH 1/3] sha1dc: update from upstream Ævar Arnfjörð Bjarmason
2017-06-06 15:12             ` [PATCH 2/3] sha1dc: optionally use sha1collisiondetection as a submodule Ævar Arnfjörð Bjarmason
2017-06-06 18:48               ` Stefan Beller
2017-06-06 19:03                 ` Ævar Arnfjörð Bjarmason
2017-06-06 19:09                   ` Stefan Beller
2017-06-06 15:12             ` [PATCH 3/3] sha1collisiondetection: automatically enable when submodule is populated Ævar Arnfjörð Bjarmason
2017-06-06 18:23             ` [PATCH 0/3] update sha1dc Stefan Beller
2017-06-06 18:51               ` Ævar Arnfjörð Bjarmason
2017-06-06 19:01                 ` [PATCH] sha1dc: ignore indent-with-non-tab whitespace violations Jeff King
2017-06-06 19:04                   ` Ævar Arnfjörð Bjarmason [this message]
2017-06-06 19:05                   ` Stefan Beller
2017-06-13  2:09             ` [PATCH 0/3] update sha1dc Liam R. Howlett
2017-06-06 12:49         ` Git v2.13.1 SHA1 very broken Morten Welinder

Reply instructions:

You may reply publically 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 to all the recipients using the --to, --cc,
  and --in-reply-to switches of git-send-email(1):

  git send-email \
    --in-reply-to='CACBZZX4FsGHha_Nuw=Tbw86Ghh5Mm7ocbmVXNVS7iXnGWT0bdQ@mail.gmail.com' \
    --to=avarab@gmail.com \
    --cc=Liam.Howlett@oracle.com \
    --cc=adam@dinwoodie.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=michael.kebe@gmail.com \
    --cc=peff@peff.net \
    --cc=ramsay@ramsayjones.plus.com \
    --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

git@vger.kernel.org mailing list mirror (one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/
       or Tor2web: https://www.tor2web.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox