[v2,2/2] CoC: update to version 2.0 + local changes

Commit Message

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

Update the CoC added in 5cdf2301 (add a Code of Conduct document,
2019-09-24 from version 1.4 to version 2.0. This is the version found
at [1] with the following minor changes:

 - We preserve the change to the CoC in 3f9ef874a73 (CODE_OF_CONDUCT:
   mention individual project-leader emails, 2019-09-26)

 - We preserve the custom into added in 5cdf2301d4a (add a Code of
   Conduct document, 2019-09-24)

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.

1. https://www.contributor-covenant.org/version/2/0/code_of_conduct/code_of_conduct.md
---
 CODE_OF_CONDUCT.md | 153 ++++++++++++++++++++++++++++++---------------
 1 file changed, 104 insertions(+), 49 deletions(-)

Comments

Junio C Hamano Dec. 28, 2020, 10:58 p.m. UTC | #1

Æ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.

If you still want to do so, we should tweak .gitattributes so that
"git diff --check" would not trigger.

> 1. https://www.contributor-covenant.org/version/2/0/code_of_conduct/code_of_conduct.md

Yes, thanks for the full URL.  In 5cdf2301 (add a Code of Conduct
document, 2019-09-24) we pointed at the HTML version, but if we ship
MD and they have MD, using theirs as the base makes perfect sense.

Sign-off plus acks need to be collected here.

Thanks.

Elijah Newren Dec. 29, 2020, 2:02 a.m. UTC | #2

On Mon, Dec 28, 2020 at 5:33 PM Junio C Hamano <[e-mail]> wrote:
>
> Æ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.
>
> If you still want to do so, we should tweak .gitattributes so that
> "git diff --check" would not trigger.
>
> > 1. https://www.contributor-covenant.org/version/2/0/code_of_conduct/code_of_conduct.md
>
> Yes, thanks for the full URL.  In 5cdf2301 (add a Code of Conduct
> document, 2019-09-24) we pointed at the HTML version, but if we ship
> MD and they have MD, using theirs as the base makes perfect sense.
>
> Sign-off plus acks need to be collected here.

I like updating to 2.0, and minimizing the differences between our
version and upstream.

Acked-by: Elijah Newren <[e-mail]>

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

Ævar Arnfjörð Bjarmason wrote:

> Update the CoC added in 5cdf2301 (add a Code of Conduct document,
> 2019-09-24 from version 1.4 to version 2.0. This is the version found
> at [1] with the following minor changes:
>
>  - We preserve the change to the CoC in 3f9ef874a73 (CODE_OF_CONDUCT:
>    mention individual project-leader emails, 2019-09-26)
>
>  - We preserve the custom into added in 5cdf2301d4a (add a Code of

nit: s/into/intro/

>    Conduct document, 2019-09-24)
>
> 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.
>
> 1. https://www.contributor-covenant.org/version/2/0/code_of_conduct/code_of_conduct.md

Missing sign-off.

> ---
>  CODE_OF_CONDUCT.md | 153 ++++++++++++++++++++++++++++++---------------
>  1 file changed, 104 insertions(+), 49 deletions(-)

In https://code.googlesource.com/git/summit/2020/+/main/index.md, we
found this version of the contributor covenant helpful because it
provides a vocabulary for describing different ways to respond to
issues.  I think it's helpful for readers to have an understanding of
the range of ways the project leadership team might respond.

Acked-by: Jonathan Nieder <[e-mail]>

Derrick Stolee Dec. 29, 2020, 6:36 p.m. UTC | #4

On 12/28/2020 5:58 PM, Junio C Hamano wrote:
> Æ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.
> 
> If you still want to do so, we should tweak .gitattributes so that
> "git diff --check" would not trigger.
> 
>> 1. https://www.contributor-covenant.org/version/2/0/code_of_conduct/code_of_conduct.md
> 
> Yes, thanks for the full URL.  In 5cdf2301 (add a Code of Conduct
> document, 2019-09-24) we pointed at the HTML version, but if we ship
> MD and they have MD, using theirs as the base makes perfect sense.

The cosmetic changes since Junio's version are positive. Thanks.

> Sign-off plus acks need to be collected here.

Acked-by: Derrick Stolee <[e-mail]>

Christian Couder Dec. 30, 2020, 8:20 a.m. UTC | #5

On Tue, Dec 29, 2020 at 2:33 AM Junio C Hamano <[e-mail]> wrote:

> Sign-off plus acks need to be collected here.

Acked-by: Christian Couder <[e-mail]>

(with or without Junio's suggested changes).

Thanks!

brian m. carlson Jan. 8, 2021, 1:57 a.m. UTC | #6

On 2020-12-28 at 22:58:42, Junio C Hamano wrote:
> Æ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.
> 
> If you still want to do so, we should tweak .gitattributes so that
> "git diff --check" would not trigger.
> 
> > 1. https://www.contributor-covenant.org/version/2/0/code_of_conduct/code_of_conduct.md
> 
> Yes, thanks for the full URL.  In 5cdf2301 (add a Code of Conduct
> document, 2019-09-24) we pointed at the HTML version, but if we ship
> MD and they have MD, using theirs as the base makes perfect sense.
> 
> Sign-off plus acks need to be collected here.

Acked-by: brian m. carlson <[e-mail]>

Patch

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 083bd872c53..65651beada7 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -8,70 +8,64 @@  this code of conduct may be banned from the community.
 
 ## Our Pledge
 
-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.
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible 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.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment
-include:
+Examples of behavior that contributes to a positive environment for our
+community include:
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
 
-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
-## Our Responsibilities
+## Enforcement Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
 
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
 
 ## 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 community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
 
 ## 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.
-
-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
-members of the project's leadership.
-
-The project leadership team can be contacted by email as a whole at
+reported to the community leaders responsible for enforcement at
 [e-mail], or individually:
 
   - Ævar Arnfjörð Bjarmason <[e-mail]>
@@ -79,12 +73,73 @@  [e-mail], or individually:
   - Jeff King <[e-mail]>
   - Junio C Hamano <[e-mail]>
 
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
 ## 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 2.0, available at
+[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
+
+Community Impact Guidelines were inspired by 
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available 
+at [https://www.contributor-covenant.org/translations][translations].
 
 [homepage]: https://www.contributor-covenant.org
+[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations
 
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq