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

Re: [PATCH] sha1dc: ignore indent-with-non-tab whitespace violations

From
Stefan Beller <sbeller@google.com>
Date
Jun 6, 2017, 19:05 UTC
Message-ID
<CAGZ79kZ_SiiRzzE0jumsAQcmvb3LAEs9Uz5mQ5AhfOvXRniRag@mail.gmail.com>
In-Reply-To
<20170606190111.xm4nzvjhbpsw3qbg@sigill.intra.peff.net>
Show 9 quoted lines
> 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>
Reviewed-by: Stefan Beller <sbeller@google.com>
Show 15 quoted lines
> ---
>  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
>
Previous: Ævar Arnfjörð BjarmasonNext: Liam R. Howlett
Message 24 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.