From: "Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, sandals@crustytoothpaste.net,
stolee@gmail.com, jrnieder@gmail.com, emilyshaffer@google.com,
Derrick Stolee <derrickstolee@github.com>,
Derrick Stolee <dstolee@microsoft.com>
Subject: [PATCH 2/4] *: use singular they in comments
Date: Mon, 07 Jun 2021 16:57:46 +0000 [thread overview]
Message-ID: <b36e3f99716bf3976fc886df684c300e17566c79.1623085069.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.975.git.1623085069.gitgitgadget@gmail.com>
From: Derrick Stolee <dstolee@microsoft.com>
Several comments in our code refer to an anonymous user with "he/him" or
"she/her" pronouns, and the choice between the two is arbitrary.
Replace these uses with "they/them" which universally includes all
potential readers.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
---
commit.c | 2 +-
config.h | 2 +-
contrib/hooks/multimail/git_multimail.py | 4 ++--
date.c | 2 +-
pathspec.h | 2 +-
strbuf.h | 2 +-
wt-status.c | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/commit.c b/commit.c
index 8ea55a447fa9..35e93abce6ae 100644
--- a/commit.c
+++ b/commit.c
@@ -1178,7 +1178,7 @@ static void handle_signed_tag(struct commit *parent, struct commit_extra_header
/*
* We could verify this signature and either omit the tag when
* it does not validate, but the integrator may not have the
- * public key of the signer of the tag he is merging, while a
+ * public key of the signer of the tag they are merging, while a
* later auditor may have it while auditing, so let's not run
* verify-signed-buffer here for now...
*
diff --git a/config.h b/config.h
index 9038538ffdcb..7107b41a8933 100644
--- a/config.h
+++ b/config.h
@@ -451,7 +451,7 @@ void git_configset_init(struct config_set *cs);
* Parses the file and adds the variable-value pairs to the `config_set`,
* dies if there is an error in parsing the file. Returns 0 on success, or
* -1 if the file does not exist or is inaccessible. The user has to decide
- * if he wants to free the incomplete configset or continue using it when
+ * if they want to free the incomplete configset or continue using it when
* the function returns -1.
*/
int git_configset_add_file(struct config_set *cs, const char *filename);
diff --git a/contrib/hooks/multimail/git_multimail.py b/contrib/hooks/multimail/git_multimail.py
index f563be82fc7e..5932a3354f26 100755
--- a/contrib/hooks/multimail/git_multimail.py
+++ b/contrib/hooks/multimail/git_multimail.py
@@ -3219,7 +3219,7 @@ class GitoliteEnvironmentLowPrecMixin(
def get_repo_shortname(self):
# The gitolite environment variable $GL_REPO is a pretty good
# repo_shortname (though it's probably not as good as a value
- # the user might have explicitly put in his config).
+ # the user might have explicitly put in their config).
return (
self.osenv.get('GL_REPO', None) or
super(GitoliteEnvironmentLowPrecMixin, self).get_repo_shortname()
@@ -3361,7 +3361,7 @@ def get_pusher(self):
# __submitter into an RFC 2822 string already.
return re.match(r'(.*?)\s*<', self.__submitter).group(1)
else:
- # Submitter has no configured email, it's just his name.
+ # Submitter has no configured email, it's just their name.
return self.__submitter
else:
# If we arrive here, this means someone pushed "Submit" from
diff --git a/date.c b/date.c
index f9ea807b3a9f..2da0f80b9bfa 100644
--- a/date.c
+++ b/date.c
@@ -908,7 +908,7 @@ int parse_expiry_date(const char *date, timestamp_t *timestamp)
/*
* We take over "now" here, which usually translates
* to the current timestamp. This is because the user
- * really means to expire everything she has done in
+ * really means to expire everything they have done in
* the past, and by definition reflogs are the record
* of the past, and there is nothing from the future
* to be kept.
diff --git a/pathspec.h b/pathspec.h
index fceebb876f7a..6e84099bea22 100644
--- a/pathspec.h
+++ b/pathspec.h
@@ -108,7 +108,7 @@ struct pathspec {
*
* A similar process is applied when a new pathspec magic is added. The designer
* lifts the GUARD_PATHSPEC restriction in the functions that support the new
- * magic. At the same time (s)he has to make sure this new feature will be
+ * magic. At the same time they have to make sure this new feature will be
* caught at parse_pathspec() in commands that cannot handle the new magic in
* some cases. grepping parse_pathspec() should help.
*/
diff --git a/strbuf.h b/strbuf.h
index 223ee2094af8..b543e354f0ed 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -338,7 +338,7 @@ const char *strbuf_join_argv(struct strbuf *buf, int argc,
*
* In order to facilitate caching and to make it possible to give
* parameters to the callback, `strbuf_expand()` passes a context pointer,
- * which can be used by the programmer of the callback as she sees fit.
+ * which can be used by the programmer of the callback as they see fit.
*/
typedef size_t (*expand_fn_t) (struct strbuf *sb,
const char *placeholder,
diff --git a/wt-status.c b/wt-status.c
index 42b673571696..bd7ef3e4fd02 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -639,7 +639,7 @@ static void wt_status_collect_changes_index(struct wt_status *s)
* mode by passing a command line option we do not ignore any
* changed submodule SHA-1s when comparing index and HEAD, no
* matter what is configured. Otherwise the user won't be
- * shown any submodules she manually added (and which are
+ * shown any submodules they manually added (and which are
* staged to be committed), which would be really confusing.
*/
handle_ignore_submodules_arg(&rev.diffopt, "dirty");
--
gitgitgadget
next prev parent reply other threads:[~2021-06-07 16:57 UTC|newest]
Thread overview: 124+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-07 16:57 [PATCH 0/4] Use singular "they" when appropriate Derrick Stolee via GitGitGadget
2021-06-07 16:57 ` [PATCH 1/4] Documentation: use singular they " Derrick Stolee via GitGitGadget
2021-06-07 17:09 ` Ævar Arnfjörð Bjarmason
2021-06-07 17:32 ` Derrick Stolee
2021-06-07 17:42 ` Andrei Rybak
2021-06-07 18:21 ` Ævar Arnfjörð Bjarmason
2021-06-10 7:44 ` Johannes Schindelin
2021-06-10 14:35 ` Felipe Contreras
2021-06-07 21:36 ` Felipe Contreras
2021-06-09 18:47 ` Phillip Susi
2021-06-09 20:26 ` Felipe Contreras
2021-06-11 15:40 ` Phillip Susi
2021-06-11 17:03 ` Felipe Contreras
2021-06-10 18:30 ` Derrick Stolee
2021-06-11 0:16 ` Junio C Hamano
2021-06-11 16:00 ` Felipe Contreras
2021-06-12 14:02 ` Phillip Susi
2021-06-08 1:18 ` Junio C Hamano
2021-06-08 8:51 ` Kerry, Richard
2021-06-08 23:21 ` Junio C Hamano
2021-06-09 13:13 ` Derrick Stolee
2021-06-10 3:11 ` Junio C Hamano
2021-06-08 17:33 ` Emily Shaffer
2021-06-08 18:03 ` Felipe Contreras
2021-06-09 13:44 ` Kerry, Richard
2021-06-09 17:44 ` Felipe Contreras
2021-06-25 14:30 ` Kerry, Richard
2021-06-09 4:48 ` Junio C Hamano
2021-06-10 8:18 ` Johannes Schindelin
2021-06-10 14:42 ` Felipe Contreras
2021-06-14 22:10 ` Robert Karszniewicz
2021-06-07 16:57 ` Derrick Stolee via GitGitGadget [this message]
2021-06-07 17:12 ` [PATCH 2/4] *: use singular they in comments Ævar Arnfjörð Bjarmason
2021-06-07 17:20 ` Derrick Stolee
2021-06-10 8:20 ` Johannes Schindelin
2021-06-07 19:02 ` Junio C Hamano
2021-06-07 21:44 ` Felipe Contreras
2021-06-08 17:36 ` Emily Shaffer
2021-06-07 16:57 ` [PATCH 3/4] *: fix typos Derrick Stolee via GitGitGadget
2021-06-08 17:37 ` Emily Shaffer
2021-06-10 8:36 ` Johannes Schindelin
2021-06-10 19:53 ` Derrick Stolee
2021-06-11 9:55 ` Johannes Schindelin
2021-06-07 16:57 ` [PATCH 4/4] CodingGuidelines: recommend singular they Derrick Stolee via GitGitGadget
2021-06-07 18:31 ` Ævar Arnfjörð Bjarmason
2021-06-08 1:47 ` Felipe Contreras
2021-06-07 18:56 ` Junio C Hamano
2021-06-07 19:05 ` Derrick Stolee
2021-06-08 0:05 ` Junio C Hamano
2021-06-10 21:34 ` brian m. carlson
2021-06-10 8:39 ` Johannes Schindelin
2021-06-07 20:00 ` Felipe Contreras
2021-06-09 18:29 ` Phillip Susi
2021-06-09 20:18 ` Felipe Contreras
2021-06-07 20:20 ` Robert Karszniewicz
2021-06-07 22:18 ` Felipe Contreras
2021-06-08 7:10 ` Jeff King
2021-06-08 8:11 ` Felipe Contreras
2021-06-09 13:23 ` Derrick Stolee
2021-06-09 15:20 ` Felipe Contreras
2021-06-10 22:06 ` brian m. carlson
2021-06-11 16:11 ` Felipe Contreras
2021-06-08 17:39 ` Emily Shaffer
2021-06-09 4:44 ` Junio C Hamano
2021-06-09 13:27 ` Derrick Stolee
2021-06-07 20:10 ` [PATCH 0/4] Use singular "they" when appropriate Felipe Contreras
2021-06-09 13:54 ` [PATCH v2 " Derrick Stolee via GitGitGadget
2021-06-09 13:54 ` [PATCH v2 1/4] Documentation: use singular they " Derrick Stolee via GitGitGadget
2021-06-09 15:33 ` Felipe Contreras
2021-06-09 13:54 ` [PATCH v2 2/4] *: use singular they in comments Derrick Stolee via GitGitGadget
2021-06-09 15:41 ` Felipe Contreras
2021-06-09 13:54 ` [PATCH v2 3/4] *: fix typos Derrick Stolee via GitGitGadget
2021-06-09 13:54 ` [PATCH v2 4/4] CodingGuidelines: recommend singular they Derrick Stolee via GitGitGadget
2021-06-09 15:50 ` Felipe Contreras
2021-06-09 15:44 ` [PATCH v2 0/4] Use singular "they" when appropriate Ævar Arnfjörð Bjarmason
2021-06-09 17:22 ` Felipe Contreras
2021-06-10 2:03 ` Junio C Hamano
2021-06-10 2:28 ` Junio C Hamano
2021-06-10 3:30 ` Felipe Contreras
2021-06-10 22:32 ` brian m. carlson
2021-06-10 22:58 ` Ævar Arnfjörð Bjarmason
2021-06-11 16:32 ` Felipe Contreras
2021-06-11 17:18 ` Derrick Stolee
2021-06-11 20:38 ` Felipe Contreras
2021-06-13 7:17 ` Ævar Arnfjörð Bjarmason
2021-06-15 6:02 ` Junio C Hamano
2021-06-15 13:36 ` Derrick Stolee
2021-06-15 17:03 ` Felipe Contreras
2021-06-14 0:47 ` Junio C Hamano
2021-06-15 14:11 ` [PATCH v3 0/4] Avoid gendered pronouns Derrick Stolee via GitGitGadget
2021-06-15 14:11 ` [PATCH v3 1/4] doc: avoid using the gender of other people Felipe Contreras via GitGitGadget
2021-06-15 14:11 ` [PATCH v3 2/4] comments: avoid using the gender of our users Felipe Contreras via GitGitGadget
2021-06-15 14:11 ` [PATCH v3 3/4] *: fix typos Derrick Stolee via GitGitGadget
2021-06-15 14:11 ` [PATCH v3 4/4] CodingGuidelines: recommend singular they Derrick Stolee via GitGitGadget
2021-06-15 16:19 ` Ævar Arnfjörð Bjarmason
2021-06-15 17:26 ` Felipe Contreras
2021-06-16 2:47 ` Junio C Hamano
2021-06-16 5:06 ` Junio C Hamano
2021-06-16 9:26 ` Bagas Sanjaya
2021-06-16 17:44 ` Derrick Stolee
2021-06-16 19:54 ` Ævar Arnfjörð Bjarmason
2021-06-16 23:22 ` Felipe Contreras
2021-06-17 0:09 ` Junio C Hamano
2021-06-17 13:22 ` Derrick Stolee
2021-06-17 14:53 ` Ævar Arnfjörð Bjarmason
2021-06-17 17:06 ` Felipe Contreras
2021-06-17 15:25 ` Felipe Contreras
2021-06-18 0:26 ` brian m. carlson
2021-06-18 16:12 ` Felipe Contreras
2021-06-17 15:23 ` Felipe Contreras
2021-06-17 15:58 ` Ævar Arnfjörð Bjarmason
2021-06-18 0:53 ` brian m. carlson
2021-06-18 7:24 ` Ævar Arnfjörð Bjarmason
2021-06-18 16:40 ` Felipe Contreras
2021-06-19 7:03 ` Junio C Hamano
2021-06-28 22:32 ` Junio C Hamano
2021-06-29 1:31 ` Felipe Contreras
2021-06-29 1:53 ` Derrick Stolee
2021-06-29 12:29 ` Ævar Arnfjörð Bjarmason
2021-06-17 15:12 ` Felipe Contreras
2021-06-17 14:46 ` Felipe Contreras
2021-06-15 17:08 ` Felipe Contreras
2021-06-12 4:40 ` [PATCH 0/4] Use singular "they" when appropriate Bagas Sanjaya
2021-06-12 14:19 ` Phillip Susi
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=b36e3f99716bf3976fc886df684c300e17566c79.1623085069.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=derrickstolee@github.com \
--cc=dstolee@microsoft.com \
--cc=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=sandals@crustytoothpaste.net \
--cc=stolee@gmail.com \
/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).