From: Derrick Stolee <stolee@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2 2/2] CoC: update to version 2.0 + local changes
Date: Tue, 29 Dec 2020 13:36:44 -0500 [thread overview]
Message-ID: <39190d36-b1ae-37d4-2fa4-8a442fd2e6e7@gmail.com> (raw)
In-Reply-To: <xmqqmtxxedwd.fsf@gitster.c.googlers.com>
On 12/28/2020 5:58 PM, Junio C Hamano wrote:
> Æ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.
The cosmetic changes since Junio's version are positive. Thanks.
> Sign-off plus acks need to be collected here.
Acked-by: Derrick Stolee <dstolee@microsoft.com>
next prev parent reply other threads:[~2020-12-29 18:37 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-28 12:59 [PATCH] CoC: update to 2.0 Junio C Hamano
2020-12-28 15:18 ` Derrick Stolee
2020-12-28 17:02 ` brian m. carlson
2020-12-28 17:17 ` [PATCH v2 0/2] CoC: update to 2.0 with less upstream divergence Ævar Arnfjörð Bjarmason
2020-12-28 17:17 ` [PATCH v2 1/2] CoC: Update word-wrapping to match upstream Ævar Arnfjörð Bjarmason
2020-12-29 3:11 ` Jonathan Nieder
2021-01-04 23:43 ` Junio C Hamano
2020-12-28 17:17 ` [PATCH v2 2/2] CoC: update to version 2.0 + local changes Ævar Arnfjörð Bjarmason
2020-12-28 22:58 ` Junio C Hamano
2020-12-29 2:02 ` Elijah Newren
2020-12-29 18:36 ` Derrick Stolee [this message]
2020-12-30 8:20 ` Christian Couder
2021-01-04 23:47 ` Re* " Junio C Hamano
2021-01-07 23:28 ` Johannes Schindelin
2021-01-08 0:41 ` Junio C Hamano
2021-01-08 1:57 ` brian m. carlson
2020-12-29 3:17 ` Jonathan Nieder
2020-12-28 17:32 ` [PATCH] CoC: update to 2.0 Ævar Arnfjörð Bjarmason
2020-12-28 22:43 ` Junio C Hamano
2020-12-28 18:40 ` Emily Shaffer
2020-12-29 8:54 ` Pratyush Yadav
Reply instructions:
You may reply publicly 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=39190d36-b1ae-37d4-2fa4-8a442fd2e6e7@gmail.com \
--to=stolee@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).