summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Derrick Stolee <dstolee@microsoft.com>2021-06-15 14:11:11 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-06-16 11:26:20 +0900
commit46a237f42fe24545e6a2a72488ad04d836f91717 (patch)
tree3bed25d3d54cc03d0b877414dde698137391e39c
parentcomments: avoid using the gender of our users (diff)
downloadtgif-46a237f42fe24545e6a2a72488ad04d836f91717.tar.xz
*: fix typos
These typos were found while searching the codebase for gendered pronouns. In the case of t9300-fast-import.sh, remove a confusing comment that is unnecessary to the understanding of the test. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--config.c2
-rwxr-xr-xt/t9300-fast-import.sh1
2 files changed, 1 insertions, 2 deletions
diff --git a/config.c b/config.c
index 6428393a41..c008987db3 100644
--- a/config.c
+++ b/config.c
@@ -2834,7 +2834,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 5c47ac4465..7607ef65cb 100755
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -1538,7 +1538,6 @@ 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.
data <<COMMIT
dirty directory copy
COMMIT