[PATCH] CoC: update to 2.0

[PATCH] CoC: update to 2.0

[Junio C Hamano]

At 5cdf2301 (add a Code of Conduct document, 2019-09-24) we adopted
a Code of Conduct from www.contributor-covenant.org; back then the
version adopted, 1.4, was the latest one.

Version 2.0 tightens language in examples of unacceptable behaviour,
generalizes the audience from "contributors and maintainers" to
"community", and enhances the enforcement section.

The preamble we added to the beginning of the document has been
kept, but the rest of the test has been replaced in full from the
"upstream" and then the same customization for our community
(i.e. the way to contact community leadership teams) has been
applied.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

 * There was a thread to collect acks from community members at

    https://lore.kernel.org/git/xmqqd0f6n5a4.fsf_-_@gitster-ct.c.googlers.com/

   and that was how you now see many acks in the trailer of
   5cdf2301.  If we were to go ahead with this patch to move us to
   version 2.0, we'd need a similar "Ack" drive, I guess.

 CODE_OF_CONDUCT.md | 153 ++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 99 insertions(+), 54 deletions(-)

diff --git c/CODE_OF_CONDUCT.md w/CODE_OF_CONDUCT.md
index fc4645d5c0..ac13a84d1a 100644
--- c/CODE_OF_CONDUCT.md
+++ w/CODE_OF_CONDUCT.md
@@ -8,86 +8,131 @@ 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 git@sfconservancy.org. 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
-git@sfconservancy.org, or individually:
+reported to the community leaders responsible for enforcement by
+email as a whole at git@sfconservancy.org, or individually:
 
   - Ævar Arnfjörð Bjarmason <avarab@gmail.com>
   - Christian Couder <christian.couder@gmail.com>
   - Jeff King <peff@peff.net>
   - Junio C Hamano <gitster@pobox.com>
 
+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,
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
 
-[homepage]: https://www.contributor-covenant.org
+Community Impact Guidelines were inspired by
+Mozilla's code of conduct enforcement ladder.
 
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available
+at https://www.contributor-covenant.org/translations.

Re: [PATCH] CoC: update to 2.0

[Derrick Stolee]

On 12/28/2020 7:59 AM, Junio C Hamano wrote:
> At 5cdf2301 (add a Code of Conduct document, 2019-09-24) we adopted
> a Code of Conduct from www.contributor-covenant.org; back then the
> version adopted, 1.4, was the latest one.
> 
> Version 2.0 tightens language in examples of unacceptable behaviour,
> generalizes the audience from "contributors and maintainers" to
> "community", and enhances the enforcement section.

I approve of using the contributor covenant verbatim, and keeping
it updated occasionally as they find ways to improve it is a good
idea.

Acked-by: Derrick Stolee <dstolee@microsoft.com>

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

This is a more active-voice way to say the same thing. Good.
  
>  ## 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

I like that this one is at the top.

> +* 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

This last one is a good reminder that remains constant: behavior in the
community should be assumed to meet the bar of a professional setting.
This means different things to different people, so the extra examples
help clarify the expectations.

> -## 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 git@sfconservancy.org. 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
> -git@sfconservancy.org, or individually:
> +reported to the community leaders responsible for enforcement by
> +email as a whole at git@sfconservancy.org, or individually:
>  
>    - Ævar Arnfjörð Bjarmason <avarab@gmail.com>
>    - Christian Couder <christian.couder@gmail.com>
>    - Jeff King <peff@peff.net>
>    - Junio C Hamano <gitster@pobox.com>
>  
> +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.
> +

This new "mechanisms of enforcement" section is new, but helpful.
It provides guidelines for leaders and expectations for community
members.

>  ## 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,
> +version 2.0, available at
> +https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
>  
> -[homepage]: https://www.contributor-covenant.org
> +Community Impact Guidelines were inspired by
> +Mozilla's code of conduct enforcement ladder.
>  
> -For answers to common questions about this code of conduct, see
> -https://www.contributor-covenant.org/faq
> +For answers to common questions about this code of conduct, see the FAQ at
> +https://www.contributor-covenant.org/faq. Translations are available
> +at https://www.contributor-covenant.org/translations.

I approve of this change in its entirety. Thanks for putting up with
my (supportive) comments.

Thanks,
-Stolee

Re: [PATCH] CoC: update to 2.0

[brian m. carlson]

[-- Attachment #1: Type: text/plain, Size: 1030 bytes --]

On 2020-12-28 at 12:59:53, Junio C Hamano wrote:
> At 5cdf2301 (add a Code of Conduct document, 2019-09-24) we adopted
> a Code of Conduct from www.contributor-covenant.org; back then the
> version adopted, 1.4, was the latest one.
> 
> Version 2.0 tightens language in examples of unacceptable behaviour,
> generalizes the audience from "contributors and maintainers" to
> "community", and enhances the enforcement section.
> 
> The preamble we added to the beginning of the document has been
> kept, but the rest of the test has been replaced in full from the
> "upstream" and then the same customization for our community
> (i.e. the way to contact community leadership teams) has been
> applied.
> 
> Signed-off-by: Junio C Hamano <gitster@pobox.com>

This seems like a good improvement on the older version, and I agree we
should update to it.  Thanks for keeping on top of this.

Acked-by: brian m. carlson <sandals@crustytoothpaste.net>
-- 
brian m. carlson (he/him or they/them)
Houston, Texas, US

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 263 bytes --]

[PATCH v2 0/2] CoC: update to 2.0 with less upstream divergence

[Ævar Arnfjörð Bjarmason]

Here's an alternate version of this update which is hopefully easier
to read diff-wise, and produces a smaller delta with the upstream
document.

With this version the diff to upstream is ~30 lines, with Junio's it's
~60. Specifically for this one:

BEGIN DIFF

diff --git a/code_of_conduct.md b/CODE_OF_CONDUCT.md
index 4e2473b8399..65651beada7 100644
--- a/code_of_conduct.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,5 +1,10 @@
+# Git Code of Conduct
 
-# Contributor Covenant Code of Conduct
+This code of conduct outlines our expectations for participants within
+the Git community, as well as steps for reporting unacceptable behavior.
+We are committed to providing a welcoming and inspiring community for
+all and expect our code of conduct to be honored. Anyone who violates
+this code of conduct may be banned from the community.
 
 ## Our Pledge
 
@@ -61,7 +66,13 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-[INSERT CONTACT METHOD].
+git@sfconservancy.org, or individually:
+
+  - Ævar Arnfjörð Bjarmason <avarab@gmail.com>
+  - Christian Couder <christian.couder@gmail.com>
+  - Jeff King <peff@peff.net>
+  - Junio C Hamano <gitster@pobox.com>
+
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the


END DIFF

And for Junio's:

BEGIN DIFF

diff --git a/code_of_conduct.md b/CODE_OF_CONDUCT.md
index 4e2473b8399..ac13a84d1a4 100644
--- a/code_of_conduct.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,5 +1,10 @@
+# Git Code of Conduct
 
-# Contributor Covenant Code of Conduct
+This code of conduct outlines our expectations for participants within
+the Git community, as well as steps for reporting unacceptable behavior.
+We are committed to providing a welcoming and inspiring community for
+all and expect our code of conduct to be honored. Anyone who violates
+this code of conduct may be banned from the community.
 
 ## Our Pledge
 
@@ -60,8 +65,14 @@ representative at an online or offline event.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-[INSERT CONTACT METHOD].
+reported to the community leaders responsible for enforcement by
+email as a whole at git@sfconservancy.org, or individually:
+
+  - Ævar Arnfjörð Bjarmason <avarab@gmail.com>
+  - Christian Couder <christian.couder@gmail.com>
+  - Jeff King <peff@peff.net>
+  - Junio C Hamano <gitster@pobox.com>
+
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the
@@ -115,20 +126,13 @@ the community.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+This Code of Conduct is adapted from the Contributor Covenant,
 version 2.0, available at
-[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
 
-Community Impact Guidelines were inspired by 
-[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+Community Impact Guidelines were inspired by
+Mozilla's code of conduct enforcement ladder.
 
 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
-
+https://www.contributor-covenant.org/faq. Translations are available
+at https://www.contributor-covenant.org/translations.

END DIFF

Ævar Arnfjörð Bjarmason (2):
  CoC: Update word-wrapping to match upstream
  CoC: update to version 2.0 + local changes

 CODE_OF_CONDUCT.md | 154 ++++++++++++++++++++++++++++++---------------
 1 file changed, 103 insertions(+), 51 deletions(-)

-- 
2.29.2.222.g5d2a92d10f8

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

[Ævar Arnfjörð Bjarmason]

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 <avarab@gmail.com>
---
 CODE_OF_CONDUCT.md | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

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 git@sfconservancy.org. 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 @@ git@sfconservancy.org, 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
 
-- 
2.29.2.222.g5d2a92d10f8

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

[Ævar Arnfjörð Bjarmason]

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(-)

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 git@sfconservancy.org. 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
 git@sfconservancy.org, or individually:
 
   - Ævar Arnfjörð Bjarmason <avarab@gmail.com>
@@ -79,12 +73,73 @@ git@sfconservancy.org, or individually:
   - Jeff King <peff@peff.net>
   - Junio C Hamano <gitster@pobox.com>
 
+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
-- 
2.29.2.222.g5d2a92d10f8

Re: [PATCH] CoC: update to 2.0

[Ævar Arnfjörð Bjarmason]

On Mon, Dec 28 2020, Junio C Hamano wrote:

> At 5cdf2301 (add a Code of Conduct document, 2019-09-24) we adopted
> a Code of Conduct from www.contributor-covenant.org; back then the
> version adopted, 1.4, was the latest one.
>
> Version 2.0 tightens language in examples of unacceptable behaviour,
> generalizes the audience from "contributors and maintainers" to
> "community", and enhances the enforcement section.
>
> The preamble we added to the beginning of the document has been
> kept, but the rest of the test has been replaced in full from the
> "upstream" and then the same customization for our community
> (i.e. the way to contact community leadership teams) has been
> applied.

I think the update to 2.0 makes sense. But would in general prefer less
divergence with upstream for code or documents we copy/paste.

So I submitted a v2 in
https://lore.kernel.org/git/20201228171734.30038-1-avarab@gmail.com/
whose diff to upstream is half the size of yours. Perhaps you like it
better, or not.

In any case: Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>

The thing I'm most on the fence about in 2.0 is the addition of very
specific enforcement guidelines.

They're still guidelines, so they're not a promise that we'll do things
exactly like that. I still think the sentence from Jeff's addition of
1.4 makes more sense for us as a project:

    It probably make sense _not_ to get too specific at this point, and
    deal with specifics as they come up.

E.g. the phrasing in the new "Temporary Ban" which seems to suggest that
if we were to take action based on the CoC that it's up to us to police
interaction between the parties involved on third-party social media
platforms.

I don't think it's going to be much of a practical concern. It just
seems to me the upstream 2.0 CoC makes a lot of assumptions about
projects being run in a way where they manage most of their
communications infrastructure directly in a silo'd manner.

We don't even manage the Git ML directly, and surely the main point the
CoC is to communicate to existing and new project participants what's
expected of them when it comes to interacting with the community.

If the enforcment guidelines promise something that's unlikely to be
practical in our case perhaps we'd be better off by leaving that entire
section out of the CoC update.

Re: [PATCH] CoC: update to 2.0

[Emily Shaffer]

On Mon, Dec 28, 2020 at 04:59:53AM -0800, Junio C Hamano wrote:
> 
> At 5cdf2301 (add a Code of Conduct document, 2019-09-24) we adopted
> a Code of Conduct from www.contributor-covenant.org; back then the
> version adopted, 1.4, was the latest one.
> 
> Version 2.0 tightens language in examples of unacceptable behaviour,
> generalizes the audience from "contributors and maintainers" to
> "community", and enhances the enforcement section.
> 
> The preamble we added to the beginning of the document has been
> kept, but the rest of the test has been replaced in full from the
> "upstream" and then the same customization for our community
> (i.e. the way to contact community leadership teams) has been
> applied.
> 
> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Thanks for pulling the update.

Reviewed-by: Emily Shaffer <emilyshaffer@google.com>
> ---
> 
>  * There was a thread to collect acks from community members at
> 
>     https://lore.kernel.org/git/xmqqd0f6n5a4.fsf_-_@gitster-ct.c.googlers.com/
> 
>    and that was how you now see many acks in the trailer of
>    5cdf2301.  If we were to go ahead with this patch to move us to
>    version 2.0, we'd need a similar "Ack" drive, I guess.

Re: [PATCH] CoC: update to 2.0

[Junio C Hamano]

Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:

> I think the update to 2.0 makes sense. But would in general prefer less
> divergence with upstream for code or documents we copy/paste.
>
> So I submitted a v2 in
> https://lore.kernel.org/git/20201228171734.30038-1-avarab@gmail.com/
> whose diff to upstream is half the size of yours. Perhaps you like it
> better, or not.

I _think_ most of the divergence comes from the fact that I copied
from a wrong variant.  I somehow picked asciidoc variant and
manually adjusted the section leaders, and I wouldn't be surprised
if it wraps lines differently from their markdown variant.

As I expect to be mostly offline this week, I'll let your series sit
on the list while it collects Acks just like we did for the version
1.4, but in any case, let's go with your variant that is based on
the official markdown version supplied by the upstream.

Thanks.

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

[Junio C Hamano]

Ævar Arnfjörð Bjarmason  <avarab@gmail.com> 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.

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

[Elijah Newren]

On Mon, Dec 28, 2020 at 5:33 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> Ævar Arnfjörð Bjarmason  <avarab@gmail.com> 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 <newren@gmail.com>

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

[Jonathan Nieder]

Æ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 <avarab@gmail.com>
> ---
>  CODE_OF_CONDUCT.md | 35 ++++++++++++++++-------------------
>  1 file changed, 16 insertions(+), 19 deletions(-)

Makes sense.
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>

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

[Jonathan Nieder]

Æ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 <jrnieder@gmail.com>

Re: [PATCH] CoC: update to 2.0

[Pratyush Yadav]

On 28/12/20 04:59AM, Junio C Hamano wrote:
> At 5cdf2301 (add a Code of Conduct document, 2019-09-24) we adopted
> a Code of Conduct from www.contributor-covenant.org; back then the
> version adopted, 1.4, was the latest one.
> 
> Version 2.0 tightens language in examples of unacceptable behaviour,
> generalizes the audience from "contributors and maintainers" to
> "community", and enhances the enforcement section.
> 
> The preamble we added to the beginning of the document has been
> kept, but the rest of the test has been replaced in full from the

s/test/text/

> "upstream" and then the same customization for our community
> (i.e. the way to contact community leadership teams) has been
> applied.
> 
> Signed-off-by: Junio C Hamano <gitster@pobox.com>

-- 
Regards,
Pratyush Yadav

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

[Derrick Stolee]

On 12/28/2020 5:58 PM, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason  <avarab@gmail.com> 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 <dstolee@microsoft.com>

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

[Christian Couder]

On Tue, Dec 29, 2020 at 2:33 AM Junio C Hamano <gitster@pobox.com> wrote:

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

Acked-by: Christian Couder <chriscool@tuxfamily.org>

(with or without Junio's suggested changes).

Thanks!

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

[Junio C Hamano]

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

Re* [PATCH v2 2/2] CoC: update to version 2.0 + local changes

[Junio C Hamano]

Junio C Hamano <gitster@pobox.com> writes:

> Ævar Arnfjörð Bjarmason  <avarab@gmail.com> 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@pobox.com>
---
 .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

Re: Re* [PATCH v2 2/2] CoC: update to version 2.0 + local changes

[Johannes Schindelin]

[-- Attachment #1: Type: text/plain, Size: 1057 bytes --]

Hi Junio,

On Mon, 4 Jan 2021, Junio C Hamano wrote:

> Junio C Hamano <gitster@pobox.com> writes:
>
> > Ævar Arnfjörð Bjarmason  <avarab@gmail.com> 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 <johannes.schindelin@gmx.de>

Thanks,
Dscho

Re: Re* [PATCH v2 2/2] CoC: update to version 2.0 + local changes

[Junio C Hamano]

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Thanks, amended in.

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

[brian m. carlson]

[-- Attachment #1: Type: text/plain, Size: 1238 bytes --]

On 2020-12-28 at 22:58:42, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason  <avarab@gmail.com> 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 <sandals@crustytoothpaste.net>
-- 
brian m. carlson (he/him or they/them)
Houston, Texas, US

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 263 bytes --]