[v2,1/2] CoC: Update word-wrapping to match upstream

Commit Message

Ævar Arnfjörð Bjarmason Dec. 28, 2020, 5:17 p.m. UTC

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. There are no non-whitespace changes here.

1. https://www.contributor-covenant.org/version/1/4/code-of-conduct/
2. https://github.com/ContributorCovenant/contributor_covenant

Signed-off-by: Ævar Arnfjörð Bjarmason <[e-mail]>
---
 CODE_OF_CONDUCT.md | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

Comments

Jonathan Nieder Dec. 29, 2020, 3:11 a.m. UTC | #1

Ævar Arnfjörð Bjarmason wrote:

> 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. There are no non-whitespace changes here.
>
> 1. https://www.contributor-covenant.org/version/1/4/code-of-conduct/
> 2. https://github.com/ContributorCovenant/contributor_covenant
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <[e-mail]>
> ---
>  CODE_OF_CONDUCT.md | 35 ++++++++++++++++-------------------
>  1 file changed, 16 insertions(+), 19 deletions(-)

Makes sense.
Reviewed-by: Jonathan Nieder <[e-mail]>

Junio C Hamano Jan. 4, 2021, 11:43 p.m. UTC | #2

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

Patch

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index fc4645d5c08..083bd872c53 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -10,11 +10,10 @@  this code of conduct may be banned from the community.
 
 In the interest of fostering an open and welcoming environment, we as
 contributors and maintainers pledge to make participation in our project and
-our community a harassment-free experience for everyone, regardless of age,
-body size, disability, ethnicity, sex characteristics, gender identity and
-expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
 
 ## Our Standards
 
@@ -52,23 +51,21 @@  threatening, offensive, or harmful.
 
 ## Scope
 
-This Code of Conduct applies within all project spaces, and it also applies
-when an individual is representing the project or its community in public
-spaces. Examples of representing a project or community include using an
-official project e-mail address, posting via an official social media account,
-or acting as an appointed representative at an online or offline event.
-Representation of a project may be further defined and clarified by project
-maintainers.
+This Code of Conduct applies within all project spaces, and it also applies when
+an individual is representing the project or its community in public spaces.
+Examples of representing a project or community include using an official
+project e-mail address, posting via an official social media account, or acting
+as an appointed representative at an online or offline event. Representation of
+a project may be further defined and clarified by project maintainers.
 
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported by contacting the project team at [e-mail]. All
-complaints will be reviewed and investigated and will result in a response
-that is deemed necessary and appropriate to the circumstances. The project
-team is obligated to maintain confidentiality with regard to the reporter of
-an incident. Further details of specific enforcement policies may be posted
-separately.
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good
 faith may face temporary or permanent repercussions as determined by other
@@ -84,8 +81,8 @@  [e-mail], or individually:
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 1.4, available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
 
 [homepage]: https://www.contributor-covenant.org