From: Junio C Hamano <gitster@pobox.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2 1/2] CoC: Update word-wrapping to match upstream
Date: Mon, 04 Jan 2021 15:43:56 -0800 [thread overview]
Message-ID: <xmqqzh1o5kub.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: 20201228171734.30038-2-avarab@gmail.com
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
> When the CoC document was added in 5cdf2301d4a (add a Code of Conduct
> document, 2019-09-24) it was added from some 1.4 version of the
> document whose word wrapping doesn't match what's currently at [1],
> which matches content/version/1/4/code-of-conduct.md in the CoC
> repository[2].
>
> Let's update our version to match that, to make reading subsequent
> diffs easier.
... because a patch going straight to upstream's 2.0 would have to
include the three hunks we see here, that would be a noise because
the diff between upstream's 1.4 and 2.0 does not touch these places?
If so, then this step makes sense to me.
> There are no non-whitespace changes here.
Not a comment about this patch, but "git show --word-diff" would
still show three hunks with no change highlighted as expected.
I wonder if the word-diff (or color-words) logic should be further
taught to squelch out the hunks that do not change anything other
than line wrapping and whitespace fuzz.
Thanks.
next prev parent reply other threads:[~2021-01-04 23:44 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 [this message]
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
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=xmqqzh1o5kub.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
/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).