From: Johannes Schindelin Date: Thu, 07 Jan 2021 23:28:49 GMT Subject: Re: Re* [PATCH v2 2/2] CoC: update to version 2.0 + local changes Message-ID: In-Reply-To: Hi Junio, On Mon, 4 Jan 2021, Junio C Hamano wrote: > Junio C Hamano writes: > > > Ævar Arnfjörð Bjarmason 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 Thanks, Dscho