| Message ID | 20210611202819.47077-3-felipe.contreras@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Avoid gender pronouns | expand |
On 6/11/2021 4:28 PM, Felipe Contreras wrote: > We generally avoid specifying the gender of our users in order to be > more politically correct, but sometimes due to lack of time and/or > creativity a few slip by. s/politically correct/inclusive/ Instead of "lack of time and/or creativity" perhaps be more generous to our fellow contributors and instead say... but sometimes a few slip by due to habit. > @@ -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 that has been done in nit: s/has been/was/ We can be a little more active here. -Stolee
On Tue, 2021-06-15 at 09:31 -0400, Derrick Stolee wrote:
> but sometimes a few slip by due to habit.
Or perhaps just, "but sometimes a few slip by" ?
No need to suggest a reason IMO.
Derrick Stolee wrote: > On 6/11/2021 4:28 PM, Felipe Contreras wrote: > > We generally avoid specifying the gender of our users in order to be > > more politically correct, but sometimes due to lack of time and/or > > creativity a few slip by. > > s/politically correct/inclusive/ I don't believe avoiding pronouns makes us more inclusive, and I've yet to see an example where any person would feel personally excluded from. > Instead of "lack of time and/or creativity" perhaps be more > generous to our fellow contributors and instead say... I believe my wording is more generous because it implies they tried, whereas yours implies they didn't even try. > but sometimes a few slip by due to habit. > > > @@ -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 that has been done in > > nit: s/has been/was/ > > We can be a little more active here. True. That's probably better. Cheers.
Paul Smith wrote: > On Tue, 2021-06-15 at 09:31 -0400, Derrick Stolee wrote: > > but sometimes a few slip by due to habit. > > Or perhaps just, "but sometimes a few slip by" ? > > No need to suggest a reason IMO. There's no need, but I would prefer to imply no ill intent, nor neglect, iow: they tried. But I'm fine with not specifying a reason too.
diff --git a/commit.c b/commit.c index 8ea55a447f..143f472c0f 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 being merged, 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 9038538ffd..a2200f3111 100644 --- a/config.h +++ b/config.h @@ -450,8 +450,8 @@ 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 + * -1 if the file does not exist or is inaccessible. The caller decides + * whether 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/date.c b/date.c index f9ea807b3a..5c35f2bdfe 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 that has been 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 fceebb876f..2341dc9901 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 while at the same time making 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 223ee2094a..a86dcaaf44 100644 --- a/strbuf.h +++ b/strbuf.h @@ -337,8 +337,8 @@ const char *strbuf_join_argv(struct strbuf *buf, int argc, * placeholder is unknown, then the percent sign is copied, too. * * 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. + * parameters to the callback, `strbuf_expand()` passes a context + * pointer with any kind of data. */ typedef size_t (*expand_fn_t) (struct strbuf *sb, const char *placeholder, diff --git a/wt-status.c b/wt-status.c index 42b6735716..ebc0c0da1a 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 manually added (and which are * staged to be committed), which would be really confusing. */ handle_ignore_submodules_arg(&rev.diffopt, "dirty");
We generally avoid specifying the gender of our users in order to be more politically correct, but sometimes due to lack of time and/or creativity a few slip by. Since by doing a little bit of rewording we can avoid this irrelevant detail, let's do so. Inspired-by: Derrick Stolee <dstolee@microsoft.com> Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> --- commit.c | 2 +- config.h | 4 ++-- date.c | 2 +- pathspec.h | 2 +- strbuf.h | 4 ++-- wt-status.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-)