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
