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

Re: [PATCH v2 2/2] CoC: update to version 2.0 + local changes

From
Elijah Newren <newren@gmail.com>
Date
Dec 29, 2020, 02:02 UTC
Message-ID
<CABPp-BFH6YmN_sWa5v9AUYEZrir6xRhQ-J5d=5j=XjMmRDx=DA@mail.gmail.com>
In-Reply-To
<xmqqmtxxedwd.fsf@gitster.c.googlers.com>
On Mon, Dec 28, 2020 at 5:33 PM Junio C Hamano <gitster@pobox.com> wrote:
Show 23 quoted lines
>
> Ævar Arnfjörð Bjarmason  <avarab@gmail.com> writes:
>
> > This change intentionally preserves a warning emitted on "git diff
> > --check". It's better to make it easily diff-able with upstream than
> > to fix whitespace changes in our version while we're at it.
>
> I think there are only two lines that needs to tolerate trailing
> whitespaces, and even if we strip them, it should be still easily
> diff-able with the upstream with --ignore-space-at-eol or whatever
> appropriate option, so I am not sure if it is worth try "keeping"
> these whitespace breakage.
>
> If you still want to do so, we should tweak .gitattributes so that
> "git diff --check" would not trigger.
>
> > 1. https://www.contributor-covenant.org/version/2/0/code_of_conduct/code_of_conduct.md
>
> Yes, thanks for the full URL.  In 5cdf2301 (add a Code of Conduct
> document, 2019-09-24) we pointed at the HTML version, but if we ship
> MD and they have MD, using theirs as the base makes perfect sense.
>
> Sign-off plus acks need to be collected here.

I like updating to 2.0, and minimizing the differences between our version and upstream.

Acked-by: Elijah Newren <newren@gmail.com>
Previous: Junio C HamanoNext: Derrick Stolee
Message 7 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.