Junio C Hamano <gitster@xxxxxxxxx> writes: > Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> 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 <gitster@xxxxxxxxx> --- .gitattributes | 1 + 1 file changed, 1 insertion(+) 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 -- 2.30.0-170-g148fa4353e
