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

Re: [PATCH v2 1/2] CoC: Update word-wrapping to match upstream

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 4, 2021, 23:43 UTC
Message-ID
<xmqqzh1o5kub.fsf@gitster.c.googlers.com>
In-Reply-To
<20201228171734.30038-2-avarab@gmail.com>
Ævar Arnfjörð Bjarmason  <avarab@gmail.com> writes:
Show 8 quoted lines
> When the CoC document was added in 5cdf2301d4a (add a Code of Conduct
> document, 2019-09-24) it was added from some 1.4 version of the
> document whose word wrapping doesn't match what's currently at [1],
> which matches content/version/1/4/code-of-conduct.md in the CoC
> repository[2].
>
> Let's update our version to match that, to make reading subsequent
> diffs easier.

... because a patch going straight to upstream's 2.0 would have to include the three hunks we see here, that would be a noise because the diff between upstream's 1.4 and 2.0 does not touch these places?

If so, then this step makes sense to me.
> There are no non-whitespace changes here.

Not a comment about this patch, but "git show --word-diff" would still show three hunks with no change highlighted as expected.

I wonder if the word-diff (or color-words) logic should be further taught to squelch out the hunks that do not change anything other than line wrapping and whitespace fuzz.

Thanks.
Previous: Jonathan NiederNext: Ævar Arnfjörð Bjarmason
Message 17 of 21 in “CoC: update to 2.0”
  1. CoC: update to 2.0Junio C Hamano, Dec 28, 2020
  2. Derrick StoleeDec 28, 2020
  3. brian m. carlsonDec 28, 2020
  4. 0/2 CoC: update to 2.0 with less upstream divergenceÆvar Arnfjörð Bjarmason, Dec 28, 2020
  5. 2/2 CoC: update to version 2.0 + local changesÆvar Arnfjörð Bjarmason, Dec 28, 2020
  6. Junio C HamanoDec 28, 2020
  7. Elijah NewrenDec 29, 2020
  8. Derrick StoleeDec 29, 2020
  9. Christian CouderDec 30, 2020
  10. Re* [PATCH v2 2/2] CoC: update to version 2.0 + local changesJunio C Hamano, Jan 4, 2021
  11. Johannes SchindelinJan 7, 2021
  12. Junio C HamanoJan 8, 2021
  13. brian m. carlsonJan 8, 2021
  14. Jonathan NiederDec 29, 2020
  15. 1/2 CoC: Update word-wrapping to match upstreamÆvar Arnfjörð Bjarmason, Dec 28, 2020
  16. Jonathan NiederDec 29, 2020
  17. Junio C HamanoJan 4, 2021
  18. Ævar Arnfjörð BjarmasonDec 28, 2020
  19. Junio C HamanoDec 28, 2020
  20. Emily ShafferDec 28, 2020
  21. Pratyush YadavDec 29, 2020

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.