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

Commit Message

Junio C Hamano Jan. 4, 2021, 11:47 p.m. UTC

Junio C Hamano <[e-mail]> writes:

> Ævar Arnfjörð Bjarmason  <[e-mail]> 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.

In the meantime, I'll insert this as step [1.5/2] while queuing.

In any case, your [2/2] lacks your sign-off, which we eventually
need to have before applying these patches.  In the meantime, we
also need to collect Acks on the move to 2.0 from folks.

Thanks.

---- >8 -------- >8 -------- >8 -------- >8 -------- >8 ----
Subject: [PATCH] CoC: explicitly take any whitespace breakage

We'll keep this document mostly in sync with the upstream; let's
help "git am" and "git show" by telling them that they may introduce
what we may consider whitespace errors.

Signed-off-by: Junio C Hamano <[e-mail]>
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

Comments

Johannes Schindelin Jan. 7, 2021, 11:28 p.m. UTC | #1

Hi Junio,

On Mon, 4 Jan 2021, Junio C Hamano wrote:

> Junio C Hamano <[e-mail]> writes:
>
> > Ævar Arnfjörð Bjarmason  <[e-mail]> 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.
>
> In the meantime, I'll insert this as step [1.5/2] while queuing.
>
> In any case, your [2/2] lacks your sign-off, which we eventually
> need to have before applying these patches.  In the meantime, we
> also need to collect Acks on the move to 2.0 from folks.

Acked-by: Johannes Schindelin <[e-mail]>

Thanks,
Dscho

Junio C Hamano Jan. 8, 2021, 12:41 a.m. UTC | #2

Johannes Schindelin <[e-mail]> writes:

> Acked-by: Johannes Schindelin <[e-mail]>

Thanks, amended in.

Patch

diff --git a/.gitattributes b/.gitattributes
index b08a1416d8..b0044cf272 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,6 +6,7 @@ 
 *.pm eol=lf diff=perl
 *.py eol=lf diff=python
 *.bat eol=crlf
+CODE_OF_CONDUCT.md -whitespace
 /Documentation/**/*.txt eol=lf
 /command-list.txt eol=lf
 /GIT-VERSION-GEN eol=lf