| Message ID | c40ad4a058a75d57adc97b8252ad0f57600b8d86.1623085069.git.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Use singular "they" when appropriate | expand |
On Mon, Jun 07, 2021 at 04:57:47PM +0000, Derrick Stolee via GitGitGadget wrote: > > > These typos were found while searching the codebase for gendered > pronouns. Around snickering to myself trying to figure out alternate meanings where these aren't typos, Reviewed-by: Emily Shaffer <emilyshaffer@google.com>
Hi, On Mon, 7 Jun 2021, Derrick Stolee via GitGitGadget wrote: > diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh > index 5c47ac4465cb..7039b5c6028d 100755 > --- a/t/t9300-fast-import.sh > +++ b/t/t9300-fast-import.sh > @@ -1538,7 +1538,7 @@ test_expect_success 'O: comments are all skipped' ' > commit refs/heads/O1 > # -- ignore all of this text > committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE > - # $GIT_COMMITTER_NAME has inserted here for his benefit. > + # $GIT_COMMITTER_NAME has inserted here for this benefit. What is this even supposed to mean? I fail to parse that sentence in both original and modified forms. Looking at 401d53fa350 (Teach fast-import to ignore lines starting with '#', 2007-08-01), where the comment was added, I deduce from the commit message that the personal pronoun _was_ actually intended. So maybe a better way to express the original intent would be this: # comment added by $GIT_COMMITTER_NAME; fast-import should ignore it Ciao, Dscho
On 6/10/2021 4:36 AM, Johannes Schindelin wrote: > Hi, > > On Mon, 7 Jun 2021, Derrick Stolee via GitGitGadget wrote: > >> diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh >> index 5c47ac4465cb..7039b5c6028d 100755 >> --- a/t/t9300-fast-import.sh >> +++ b/t/t9300-fast-import.sh >> @@ -1538,7 +1538,7 @@ test_expect_success 'O: comments are all skipped' ' >> commit refs/heads/O1 >> # -- ignore all of this text >> committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE >> - # $GIT_COMMITTER_NAME has inserted here for his benefit. >> + # $GIT_COMMITTER_NAME has inserted here for this benefit. > > What is this even supposed to mean? I fail to parse that sentence in both > original and modified forms. I missed that there appears to be a second typo, s/has/was/, giving # $GIT_COMMITTER_NAME was inserted here for this benefit implying that the environment variable exists to allow changing the committer info during this process. > Looking at 401d53fa350 (Teach fast-import to ignore lines starting with > '#', 2007-08-01), where the comment was added, I deduce from the commit > message that the personal pronoun _was_ actually intended. > > So maybe a better way to express the original intent would be this: > > # comment added by $GIT_COMMITTER_NAME; fast-import should ignore it I think the first comment "# -- ignore all of this text" satisfies that need, so maybe we just delete this typo line? Thanks, -Stolee
Hi Stolee, On Thu, 10 Jun 2021, Derrick Stolee wrote: > On 6/10/2021 4:36 AM, Johannes Schindelin wrote: > > > > On Mon, 7 Jun 2021, Derrick Stolee via GitGitGadget wrote: > > > >> diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh > >> index 5c47ac4465cb..7039b5c6028d 100755 > >> --- a/t/t9300-fast-import.sh > >> +++ b/t/t9300-fast-import.sh > >> @@ -1538,7 +1538,7 @@ test_expect_success 'O: comments are all skipped' ' > >> commit refs/heads/O1 > >> # -- ignore all of this text > >> committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE > >> - # $GIT_COMMITTER_NAME has inserted here for his benefit. > >> + # $GIT_COMMITTER_NAME has inserted here for this benefit. > > > > What is this even supposed to mean? I fail to parse that sentence in both > > original and modified forms. > > I missed that there appears to be a second typo, s/has/was/, giving > > # $GIT_COMMITTER_NAME was inserted here for this benefit > > implying that the environment variable exists to allow changing the > committer info during this process. > > > Looking at 401d53fa350 (Teach fast-import to ignore lines starting with > > '#', 2007-08-01), where the comment was added, I deduce from the commit > > message that the personal pronoun _was_ actually intended. > > > > So maybe a better way to express the original intent would be this: > > > > # comment added by $GIT_COMMITTER_NAME; fast-import should ignore it > > I think the first comment "# -- ignore all of this text" satisfies > that need, so maybe we just delete this typo line? D'oh! That's the best solution. Just delete that line. Thanks, Dscho
diff --git a/config.c b/config.c index f9c400ad3062..7bb96f8f7124 100644 --- a/config.c +++ b/config.c @@ -2837,7 +2837,7 @@ static void maybe_remove_section(struct config_store_data *store, begin = store->parsed[i].begin; /* - * Next, make sure that we are removing he last key(s) in the section, + * Next, make sure that we are removing the last key(s) in the section, * and that there are no comments that are possibly about the current * section. */ diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 5c47ac4465cb..7039b5c6028d 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -1538,7 +1538,7 @@ test_expect_success 'O: comments are all skipped' ' commit refs/heads/O1 # -- ignore all of this text committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - # $GIT_COMMITTER_NAME has inserted here for his benefit. + # $GIT_COMMITTER_NAME has inserted here for this benefit. data <<COMMIT dirty directory copy COMMIT