[PATCH] fix typos which duplicate a word

[PATCH] fix typos which duplicate a word

[Andrei Rybak]

Fix typos in documentation and code comments which repeat various words.
These typos were found by searching using scripts like this:

	for w in $(grep '^....$' /usr/share/dict/words)
	do
		git grep -P "\b$w $w\b"
	done

Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>
---

I'm not sure what to put as the "area: " prefix for this patch, as it touches
both docs and code comments.

 Documentation/technical/protocol-v2.txt | 2 +-
 attr.c                                  | 2 +-
 builtin/log.c                           | 3 +--
 git-compat-util.h                       | 2 +-
 git-cvsserver.perl                      | 2 +-
 remote.c                                | 2 +-
 t/t5505-remote.sh                       | 2 +-
 t/t6416-recursive-corner-cases.sh       | 2 +-
 t/t9100-git-svn-basic.sh                | 2 +-
 9 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Documentation/technical/protocol-v2.txt b/Documentation/technical/protocol-v2.txt
index a1e31367f4..1040d85319 100644
--- a/Documentation/technical/protocol-v2.txt
+++ b/Documentation/technical/protocol-v2.txt
@@ -540,7 +540,7 @@ An `object-info` request takes the following arguments:
 	Indicates to the server an object which the client wants to obtain
 	information for.
 
-The response of `object-info` is a list of the the requested object ids
+The response of `object-info` is a list of the requested object ids
 and associated requested information, each separated by a single space.
 
 	output = info flush-pkt
diff --git a/attr.c b/attr.c
index 9e897e43f5..d029e681f2 100644
--- a/attr.c
+++ b/attr.c
@@ -685,7 +685,7 @@ static struct attr_stack *read_attr_from_array(const char **list)
  * Callers into the attribute system assume there is a single, system-wide
  * global state where attributes are read from and when the state is flipped by
  * calling git_attr_set_direction(), the stack frames that have been
- * constructed need to be discarded so so that subsequent calls into the
+ * constructed need to be discarded so that subsequent calls into the
  * attribute system will lazily read from the right place.  Since changing
  * direction causes a global paradigm shift, it should not ever be called while
  * another thread could potentially be calling into the attribute system.
diff --git a/builtin/log.c b/builtin/log.c
index 6102893fcc..516a1142dd 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1968,8 +1968,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 	} else if (rev.diffopt.close_file) {
 		/*
 		 * The diff code parsed --output; it has already opened the
-		 * file, but but we must instruct it not to close after each
-		 * diff.
+		 * file, but we must instruct it not to close after each diff.
 		 */
 		rev.diffopt.no_free = 1;
 	} else {
diff --git a/git-compat-util.h b/git-compat-util.h
index a508dbe5a3..df7dae9be1 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -1368,7 +1368,7 @@ static inline void *container_of_or_null_offset(void *ptr, size_t offset)
 	(type *)container_of_or_null_offset(ptr, offsetof(type, member))
 
 /*
- * like offsetof(), but takes a pointer to a a variable of type which
+ * like offsetof(), but takes a pointer to a variable of type which
  * contains @member, instead of a specified type.
  * @ptr is subject to multiple evaluation since we can't rely on __typeof__
  * everywhere.
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index f6f3fc192c..ed035f32c2 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -2149,7 +2149,7 @@ sub req_diff
                    ( $meta2->{revision} or "workingcopy" ));
 
         # TODO: Use --label instead of -L because -L is no longer
-        #  documented and may go away someday.  Not sure if there there are
+        #  documented and may go away someday.  Not sure if there are
         #  versions that only support -L, which would make this change risky?
         #  http://osdir.com/ml/bug-gnu-utils-gnu/2010-12/msg00060.html
         #    ("man diff" should actually document the best migration strategy,
diff --git a/remote.c b/remote.c
index 6d1e8d02df..dfb863d808 100644
--- a/remote.c
+++ b/remote.c
@@ -1592,7 +1592,7 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
 			else
 				/*
 				 * If the ref isn't stale, and is reachable
-				 * from from one of the reflog entries of
+				 * from one of the reflog entries of
 				 * the local branch, force the update.
 				 */
 				force_ref_update = 1;
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index c7b392794b..e6e3c8f552 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -182,7 +182,7 @@ test_expect_success 'rename errors out early when deleting non-existent branch'
 	)
 '
 
-test_expect_success 'rename errors out early when when new name is invalid' '
+test_expect_success 'rename errors out early when new name is invalid' '
 	test_config remote.foo.vcs bar &&
 	echo "fatal: '\''invalid...name'\'' is not a valid remote name" >expect &&
 	test_must_fail git remote rename foo invalid...name 2>actual &&
diff --git a/t/t6416-recursive-corner-cases.sh b/t/t6416-recursive-corner-cases.sh
index 84f5082366..57be4a4cbb 100755
--- a/t/t6416-recursive-corner-cases.sh
+++ b/t/t6416-recursive-corner-cases.sh
@@ -871,7 +871,7 @@ test_expect_failure 'merge of D2 & E4 merges a2s & reports conflict for a/file'
 # it feels sound to say "B and C do not agree what the final pathname
 # should be, but we know this content was derived from the common A:a so we
 # use one path whose name is arbitrary in the virtual merge base X between
-# D and E" and then further let the rename detection to notice that that
+# D and E" and then further let the rename detection to notice that
 # arbitrary path gets renamed between X-D to "newname" and X-E also to
 # "newname" to resolve it as both sides renaming it to the same new
 # name. It is akin to what we do at the content level, i.e. "B and C do not
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index 1d3fdcc997..ef35a54885 100755
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -330,7 +330,7 @@ test_expect_success 'git-svn works in a bare repository' '
 	git svn fetch ) &&
 	rm -rf bare-repo
 	'
-test_expect_success 'git-svn works in in a repository with a gitdir: link' '
+test_expect_success 'git-svn works in a repository with a gitdir: link' '
 	mkdir worktree gitdir &&
 	( cd worktree &&
 	git svn init "$svnrepo" &&
-- 
2.31.1

Re: [PATCH] fix typos which duplicate a word

[Eric Sunshine]

On Wed, Jun 9, 2021 at 6:27 AM Andrei Rybak <rybak.a.v@gmail.com> wrote:
> Fix typos in documentation and code comments which repeat various words.
> These typos were found by searching using scripts like this:
> [...]
> Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>
> ---
> diff --git a/t/t6416-recursive-corner-cases.sh b/t/t6416-recursive-corner-cases.sh
> @@ -871,7 +871,7 @@ test_expect_failure 'merge of D2 & E4 merges a2s & reports conflict for a/file'
>  # it feels sound to say "B and C do not agree what the final pathname
>  # should be, but we know this content was derived from the common A:a so we
>  # use one path whose name is arbitrary in the virtual merge base X between
> -# D and E" and then further let the rename detection to notice that that
> +# D and E" and then further let the rename detection to notice that
>  # arbitrary path gets renamed between X-D to "newname" and X-E also to
>  # "newname" to resolve it as both sides renaming it to the same new
>  # name. It is akin to what we do at the content level, i.e. "B and C do not

All the other fixes for duplicate words look "obviously correct", but
in this case, the duplicate "that that" is likely intentional and
grammatically sensible, so perhaps drop this hunk from the patch?

RE: [PATCH] fix typos which duplicate a word

[Felipe Contreras]

Andrei Rybak wrote:
> Fix typos in documentation and code comments which repeat various words.
> These typos were found by searching using scripts like this:
> 
> 	for w in $(grep '^....$' /usr/share/dict/words)
> 	do
> 		git grep -P "\b$w $w\b"
> 	done
> 
> Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>

Other than the 'that that' in t6416-recursive-corner-cases.sh everything
looks obviously correct.

Reviewed-by: Felipe Contreras <felipe.contreras@gmail.com>

> ---
> 
> I'm not sure what to put as the "area: " prefix for this patch, as it touches
> both docs and code comments.

Not every patch needs to have an area, but when there's no area you
need to use uppercase.

  Fix typos which duplicate a word

-- 
Felipe Contreras

[PATCH v2] *: fix typos which duplicate a word

[Andrei Rybak]

Fix typos in documentation and code comments which repeat various words.
These typos were found by searching using scripts like this:

	for w in $(grep '^....$' /usr/share/dict/words)
	do
		git grep -P "\b$w $w\b"
	done

Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>
---

Thanks to Felipe Contreras for review.

Changes from v1:

  - added "*: " as area prefix to follow example of Derrick Stolee
    https://lore.kernel.org/git/c40ad4a058a75d57adc97b8252ad0f57600b8d86.1623085069.git.gitgitgadget@gmail.com/
  - Dropped change in t/t6416-recursive-corner-cases.sh where I misread a
    sentence and the duplicated word "that" is used correctly. Quote for
    reference:

      ... so we use one path whose name is arbitrary in the virtual merge base X
      between D and E" and then further let the rename detection to notice that
      that arbitrary path gets renamed ...

    where first "that" is a conjunction between clauses "we let" and "path gets
    renamed" and second "that" is a determiner to qualify "arbitrary path" to
    refer to "one path" mentioned in the first clause

 Documentation/technical/protocol-v2.txt | 2 +-
 attr.c                                  | 2 +-
 builtin/log.c                           | 3 +--
 git-compat-util.h                       | 2 +-
 git-cvsserver.perl                      | 2 +-
 remote.c                                | 2 +-
 t/t5505-remote.sh                       | 2 +-
 t/t9100-git-svn-basic.sh                | 2 +-
 8 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Documentation/technical/protocol-v2.txt b/Documentation/technical/protocol-v2.txt
index a1e31367f4..1040d85319 100644
--- a/Documentation/technical/protocol-v2.txt
+++ b/Documentation/technical/protocol-v2.txt
@@ -540,7 +540,7 @@ An `object-info` request takes the following arguments:
 	Indicates to the server an object which the client wants to obtain
 	information for.
 
-The response of `object-info` is a list of the the requested object ids
+The response of `object-info` is a list of the requested object ids
 and associated requested information, each separated by a single space.
 
 	output = info flush-pkt
diff --git a/attr.c b/attr.c
index 9e897e43f5..d029e681f2 100644
--- a/attr.c
+++ b/attr.c
@@ -685,7 +685,7 @@ static struct attr_stack *read_attr_from_array(const char **list)
  * Callers into the attribute system assume there is a single, system-wide
  * global state where attributes are read from and when the state is flipped by
  * calling git_attr_set_direction(), the stack frames that have been
- * constructed need to be discarded so so that subsequent calls into the
+ * constructed need to be discarded so that subsequent calls into the
  * attribute system will lazily read from the right place.  Since changing
  * direction causes a global paradigm shift, it should not ever be called while
  * another thread could potentially be calling into the attribute system.
diff --git a/builtin/log.c b/builtin/log.c
index 6102893fcc..516a1142dd 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1968,8 +1968,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 	} else if (rev.diffopt.close_file) {
 		/*
 		 * The diff code parsed --output; it has already opened the
-		 * file, but but we must instruct it not to close after each
-		 * diff.
+		 * file, but we must instruct it not to close after each diff.
 		 */
 		rev.diffopt.no_free = 1;
 	} else {
diff --git a/git-compat-util.h b/git-compat-util.h
index a508dbe5a3..df7dae9be1 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -1368,7 +1368,7 @@ static inline void *container_of_or_null_offset(void *ptr, size_t offset)
 	(type *)container_of_or_null_offset(ptr, offsetof(type, member))
 
 /*
- * like offsetof(), but takes a pointer to a a variable of type which
+ * like offsetof(), but takes a pointer to a variable of type which
  * contains @member, instead of a specified type.
  * @ptr is subject to multiple evaluation since we can't rely on __typeof__
  * everywhere.
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index f6f3fc192c..ed035f32c2 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -2149,7 +2149,7 @@ sub req_diff
                    ( $meta2->{revision} or "workingcopy" ));
 
         # TODO: Use --label instead of -L because -L is no longer
-        #  documented and may go away someday.  Not sure if there there are
+        #  documented and may go away someday.  Not sure if there are
         #  versions that only support -L, which would make this change risky?
         #  http://osdir.com/ml/bug-gnu-utils-gnu/2010-12/msg00060.html
         #    ("man diff" should actually document the best migration strategy,
diff --git a/remote.c b/remote.c
index 6d1e8d02df..dfb863d808 100644
--- a/remote.c
+++ b/remote.c
@@ -1592,7 +1592,7 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
 			else
 				/*
 				 * If the ref isn't stale, and is reachable
-				 * from from one of the reflog entries of
+				 * from one of the reflog entries of
 				 * the local branch, force the update.
 				 */
 				force_ref_update = 1;
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index c7b392794b..e6e3c8f552 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -182,7 +182,7 @@ test_expect_success 'rename errors out early when deleting non-existent branch'
 	)
 '
 
-test_expect_success 'rename errors out early when when new name is invalid' '
+test_expect_success 'rename errors out early when new name is invalid' '
 	test_config remote.foo.vcs bar &&
 	echo "fatal: '\''invalid...name'\'' is not a valid remote name" >expect &&
 	test_must_fail git remote rename foo invalid...name 2>actual &&
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index 1d3fdcc997..ef35a54885 100755
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -330,7 +330,7 @@ test_expect_success 'git-svn works in a bare repository' '
 	git svn fetch ) &&
 	rm -rf bare-repo
 	'
-test_expect_success 'git-svn works in in a repository with a gitdir: link' '
+test_expect_success 'git-svn works in a repository with a gitdir: link' '
 	mkdir worktree gitdir &&
 	( cd worktree &&
 	git svn init "$svnrepo" &&
-- 
2.31.1

RE: [PATCH v2] *: fix typos which duplicate a word

[Felipe Contreras]

> Subject: *: fix typos which duplicate a word

This is still awkward to me. "Fix typos..." is much better.

-- 
Felipe Contreras

Re: [PATCH v2] *: fix typos which duplicate a word

[Junio C Hamano]

Andrei Rybak <rybak.a.v@gmail.com> writes:

> Subject: Re: [PATCH v2] *: fix typos which duplicate a word

I think Derrick started this use of "*:" prefix to mean "not limited
to any particular area, but applies to everything" and it makes
sense.

> Fix typos in documentation and code comments which repeat various words.

Thanks.

> These typos were found by searching using scripts like this:
>
> 	for w in $(grep '^....$' /usr/share/dict/words)
> 	do
> 		git grep -P "\b$w $w\b"
> 	done

This is clarifying and somewhat puzzling at the same time.

It says that doubled words that span across line folding, and
doubled words that do not have exactly a single space in between,
have gone undetected (which is fine and may be useful information)
by showing that it grepped for lines that has doubled words.  But it
also says that you only looked for four-letter words, which I do not
believe is the case (you fixed "the the", for example), which is
misleading.  The "like this" part can be an excuse for that
inaccuracy, but then the whole thing pretty much has already been
summarized nicely with your first line already, i.e. "which repeate
various words".  If you update it the end part of the sentence to
"which repeat various words on the same line", then the entire
paragaph can go without losing clarity.

Not a huge deal, though.

The changes themselves all look good to me.  Thanks.  Will apply.

> Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>
> ---
>
> Thanks to Felipe Contreras for review.
>
> Changes from v1:
>
>   - added "*: " as area prefix to follow example of Derrick Stolee
>     https://lore.kernel.org/git/c40ad4a058a75d57adc97b8252ad0f57600b8d86.1623085069.git.gitgitgadget@gmail.com/
>   - Dropped change in t/t6416-recursive-corner-cases.sh where I misread a
>     sentence and the duplicated word "that" is used correctly. Quote for
>     reference:
>
>       ... so we use one path whose name is arbitrary in the virtual merge base X
>       between D and E" and then further let the rename detection to notice that
>       that arbitrary path gets renamed ...
>
>     where first "that" is a conjunction between clauses "we let" and "path gets
>     renamed" and second "that" is a determiner to qualify "arbitrary path" to
>     refer to "one path" mentioned in the first clause
>
>  Documentation/technical/protocol-v2.txt | 2 +-
>  attr.c                                  | 2 +-
>  builtin/log.c                           | 3 +--
>  git-compat-util.h                       | 2 +-
>  git-cvsserver.perl                      | 2 +-
>  remote.c                                | 2 +-
>  t/t5505-remote.sh                       | 2 +-
>  t/t9100-git-svn-basic.sh                | 2 +-
>  8 files changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/Documentation/technical/protocol-v2.txt b/Documentation/technical/protocol-v2.txt
> index a1e31367f4..1040d85319 100644
> --- a/Documentation/technical/protocol-v2.txt
> +++ b/Documentation/technical/protocol-v2.txt
> @@ -540,7 +540,7 @@ An `object-info` request takes the following arguments:
>  	Indicates to the server an object which the client wants to obtain
>  	information for.
>  
> -The response of `object-info` is a list of the the requested object ids
> +The response of `object-info` is a list of the requested object ids
>  and associated requested information, each separated by a single space.
>  
>  	output = info flush-pkt
> diff --git a/attr.c b/attr.c
> index 9e897e43f5..d029e681f2 100644
> --- a/attr.c
> +++ b/attr.c
> @@ -685,7 +685,7 @@ static struct attr_stack *read_attr_from_array(const char **list)
>   * Callers into the attribute system assume there is a single, system-wide
>   * global state where attributes are read from and when the state is flipped by
>   * calling git_attr_set_direction(), the stack frames that have been
> - * constructed need to be discarded so so that subsequent calls into the
> + * constructed need to be discarded so that subsequent calls into the
>   * attribute system will lazily read from the right place.  Since changing
>   * direction causes a global paradigm shift, it should not ever be called while
>   * another thread could potentially be calling into the attribute system.
> diff --git a/builtin/log.c b/builtin/log.c
> index 6102893fcc..516a1142dd 100644
> --- a/builtin/log.c
> +++ b/builtin/log.c
> @@ -1968,8 +1968,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
>  	} else if (rev.diffopt.close_file) {
>  		/*
>  		 * The diff code parsed --output; it has already opened the
> -		 * file, but but we must instruct it not to close after each
> -		 * diff.
> +		 * file, but we must instruct it not to close after each diff.
>  		 */
>  		rev.diffopt.no_free = 1;
>  	} else {
> diff --git a/git-compat-util.h b/git-compat-util.h
> index a508dbe5a3..df7dae9be1 100644
> --- a/git-compat-util.h
> +++ b/git-compat-util.h
> @@ -1368,7 +1368,7 @@ static inline void *container_of_or_null_offset(void *ptr, size_t offset)
>  	(type *)container_of_or_null_offset(ptr, offsetof(type, member))
>  
>  /*
> - * like offsetof(), but takes a pointer to a a variable of type which
> + * like offsetof(), but takes a pointer to a variable of type which
>   * contains @member, instead of a specified type.
>   * @ptr is subject to multiple evaluation since we can't rely on __typeof__
>   * everywhere.
> diff --git a/git-cvsserver.perl b/git-cvsserver.perl
> index f6f3fc192c..ed035f32c2 100755
> --- a/git-cvsserver.perl
> +++ b/git-cvsserver.perl
> @@ -2149,7 +2149,7 @@ sub req_diff
>                     ( $meta2->{revision} or "workingcopy" ));
>  
>          # TODO: Use --label instead of -L because -L is no longer
> -        #  documented and may go away someday.  Not sure if there there are
> +        #  documented and may go away someday.  Not sure if there are
>          #  versions that only support -L, which would make this change risky?
>          #  http://osdir.com/ml/bug-gnu-utils-gnu/2010-12/msg00060.html
>          #    ("man diff" should actually document the best migration strategy,
> diff --git a/remote.c b/remote.c
> index 6d1e8d02df..dfb863d808 100644
> --- a/remote.c
> +++ b/remote.c
> @@ -1592,7 +1592,7 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
>  			else
>  				/*
>  				 * If the ref isn't stale, and is reachable
> -				 * from from one of the reflog entries of
> +				 * from one of the reflog entries of
>  				 * the local branch, force the update.
>  				 */
>  				force_ref_update = 1;
> diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
> index c7b392794b..e6e3c8f552 100755
> --- a/t/t5505-remote.sh
> +++ b/t/t5505-remote.sh
> @@ -182,7 +182,7 @@ test_expect_success 'rename errors out early when deleting non-existent branch'
>  	)
>  '
>  
> -test_expect_success 'rename errors out early when when new name is invalid' '
> +test_expect_success 'rename errors out early when new name is invalid' '
>  	test_config remote.foo.vcs bar &&
>  	echo "fatal: '\''invalid...name'\'' is not a valid remote name" >expect &&
>  	test_must_fail git remote rename foo invalid...name 2>actual &&
> diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
> index 1d3fdcc997..ef35a54885 100755
> --- a/t/t9100-git-svn-basic.sh
> +++ b/t/t9100-git-svn-basic.sh
> @@ -330,7 +330,7 @@ test_expect_success 'git-svn works in a bare repository' '
>  	git svn fetch ) &&
>  	rm -rf bare-repo
>  	'
> -test_expect_success 'git-svn works in in a repository with a gitdir: link' '
> +test_expect_success 'git-svn works in a repository with a gitdir: link' '
>  	mkdir worktree gitdir &&
>  	( cd worktree &&
>  	git svn init "$svnrepo" &&

Re: [PATCH v2] *: fix typos which duplicate a word

[Andrei Rybak]

On 11/06/2021 01:59, Junio C Hamano wrote:
> Andrei Rybak <rybak.a.v@gmail.com> writes:
> 
>> Fix typos in documentation and code comments which repeat various words.
> 
> Thanks.
> 
>> These typos were found by searching using scripts like this:
>>
>> 	for w in $(grep '^....$' /usr/share/dict/words)
>> 	do
>> 		git grep -P "\b$w $w\b"
>> 	done
> 
> This is clarifying and somewhat puzzling at the same time.
> 
> It says that doubled words that span across line folding, and
> doubled words that do not have exactly a single space in between,
> have gone undetected (which is fine and may be useful information)
> by showing that it grepped for lines that has doubled words.  But it
> also says that you only looked for four-letter words, which I do not
> believe is the case (you fixed "the the", for example), which is
> misleading.  The "like this" part can be an excuse for that

Indeed. Basically, it was several scripts with different lists
of words.  I considered writing:

  	for w in <list of words>
  	do
  		git grep -P "\b$w $w\b"
  	done

but opted for an explicit example of a script used, which may
be reused later.

> inaccuracy, but then the whole thing pretty much has already been
> summarized nicely with your first line already, i.e. "which repeate
> various words".  If you update it the end part of the sentence to
> "which repeat various words on the same line",

Since v2, I've written a script to also check sentences which span
several lines.  I'll send out a v3 with a bunch more fixes.

> then the entire
> paragaph can go without losing clarity.
> Not a huge deal, though.
> 
> The changes themselves all look good to me.  Thanks.  Will apply.

[PATCH v3] *: fix typos which duplicate a word

[Andrei Rybak]

Fix typos in documentation, code comments, and RelNotes which repeat
various words.  In trivial cases, just delete the duplicated word and
rewrap text, if needed.  Reword the affected sentence in
Documentation/RelNotes/1.8.4.txt for it to make sense.

Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>
---

Thanks to Felipe Contreras and Junio C Hamano for review.

Changes since v2:

  - reworded commit message
  - new fixes in files:
    - Documentation/RelNotes/1.6.0.3.txt
    - Documentation/RelNotes/1.8.4.txt
    - Documentation/RelNotes/2.29.0.txt
    - Documentation/RelNotes/2.8.0.txt
    - Documentation/technical/hash-function-transition.txt
    - merge-recursive.c

 Documentation/RelNotes/1.6.0.3.txt                   | 2 +-
 Documentation/RelNotes/1.8.4.txt                     | 2 +-
 Documentation/RelNotes/2.29.0.txt                    | 4 ++--
 Documentation/RelNotes/2.8.0.txt                     | 2 +-
 Documentation/technical/hash-function-transition.txt | 2 +-
 Documentation/technical/protocol-v2.txt              | 2 +-
 attr.c                                               | 2 +-
 builtin/log.c                                        | 3 +--
 git-compat-util.h                                    | 2 +-
 git-cvsserver.perl                                   | 2 +-
 merge-recursive.c                                    | 2 +-
 remote.c                                             | 2 +-
 t/t5505-remote.sh                                    | 2 +-
 t/t9100-git-svn-basic.sh                             | 2 +-
 14 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/Documentation/RelNotes/1.6.0.3.txt b/Documentation/RelNotes/1.6.0.3.txt
index ae0577836a..ad36c0f0b7 100644
--- a/Documentation/RelNotes/1.6.0.3.txt
+++ b/Documentation/RelNotes/1.6.0.3.txt
@@ -50,7 +50,7 @@ Fixes since v1.6.0.2
   if the working tree is currently dirty.
 
 * "git for-each-ref --format=%(subject)" fixed for commits with no
-  no newline in the message body.
+  newline in the message body.
 
 * "git remote" fixed to protect printf from user input.
 
diff --git a/Documentation/RelNotes/1.8.4.txt b/Documentation/RelNotes/1.8.4.txt
index 255e185af6..882fa713ef 100644
--- a/Documentation/RelNotes/1.8.4.txt
+++ b/Documentation/RelNotes/1.8.4.txt
@@ -365,7 +365,7 @@ details).
    (merge 2fbd4f9 mh/maint-lockfile-overflow later to maint).
 
  * Invocations of "git checkout" used internally by "git rebase" were
-   counted as "checkout", and affected later "git checkout -" to the
+   counted as "checkout", and affected later "git checkout -" which took
    the user to an unexpected place.
    (merge 3bed291 rr/rebase-checkout-reflog later to maint).
 
diff --git a/Documentation/RelNotes/2.29.0.txt b/Documentation/RelNotes/2.29.0.txt
index 06ba2f803f..1f41302ebb 100644
--- a/Documentation/RelNotes/2.29.0.txt
+++ b/Documentation/RelNotes/2.29.0.txt
@@ -184,8 +184,8 @@ Performance, Internal Implementation, Development Support etc.
    the ref backend in use, as its format is much richer than the
    normal refs, and written directly by "git fetch" as a plain file..
 
- * An unused binary has been discarded, and and a bunch of commands
-   have been turned into into built-in.
+ * An unused binary has been discarded, and a bunch of commands
+   have been turned into built-in.
 
  * A handful of places in in-tree code still relied on being able to
    execute the git subcommands, especially built-ins, in "git-foo"
diff --git a/Documentation/RelNotes/2.8.0.txt b/Documentation/RelNotes/2.8.0.txt
index 27320b6a9f..38453281b8 100644
--- a/Documentation/RelNotes/2.8.0.txt
+++ b/Documentation/RelNotes/2.8.0.txt
@@ -377,7 +377,7 @@ notes for details).
    on that order.
 
  * "git show 'HEAD:Foo[BAR]Baz'" did not interpret the argument as a
-   rev, i.e. the object named by the the pathname with wildcard
+   rev, i.e. the object named by the pathname with wildcard
    characters in a tree object.
    (merge aac4fac nd/dwim-wildcards-as-pathspecs later to maint).
 
diff --git a/Documentation/technical/hash-function-transition.txt b/Documentation/technical/hash-function-transition.txt
index 7c1630bf83..260224b033 100644
--- a/Documentation/technical/hash-function-transition.txt
+++ b/Documentation/technical/hash-function-transition.txt
@@ -599,7 +599,7 @@ supports four different modes of operation:
     convert any object names written to output to SHA-1, but store
     objects using SHA-256.  This allows users to test the code with no
     visible behavior change except for performance.  This allows
-    allows running even tests that assume the SHA-1 hash function, to
+    running even tests that assume the SHA-1 hash function, to
     sanity-check the behavior of the new mode.
 
  2. ("early transition") Allow both SHA-1 and SHA-256 object names in
diff --git a/Documentation/technical/protocol-v2.txt b/Documentation/technical/protocol-v2.txt
index a1e31367f4..1040d85319 100644
--- a/Documentation/technical/protocol-v2.txt
+++ b/Documentation/technical/protocol-v2.txt
@@ -540,7 +540,7 @@ An `object-info` request takes the following arguments:
 	Indicates to the server an object which the client wants to obtain
 	information for.
 
-The response of `object-info` is a list of the the requested object ids
+The response of `object-info` is a list of the requested object ids
 and associated requested information, each separated by a single space.
 
 	output = info flush-pkt
diff --git a/attr.c b/attr.c
index 9e897e43f5..d029e681f2 100644
--- a/attr.c
+++ b/attr.c
@@ -685,7 +685,7 @@ static struct attr_stack *read_attr_from_array(const char **list)
  * Callers into the attribute system assume there is a single, system-wide
  * global state where attributes are read from and when the state is flipped by
  * calling git_attr_set_direction(), the stack frames that have been
- * constructed need to be discarded so so that subsequent calls into the
+ * constructed need to be discarded so that subsequent calls into the
  * attribute system will lazily read from the right place.  Since changing
  * direction causes a global paradigm shift, it should not ever be called while
  * another thread could potentially be calling into the attribute system.
diff --git a/builtin/log.c b/builtin/log.c
index 6102893fcc..516a1142dd 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1968,8 +1968,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 	} else if (rev.diffopt.close_file) {
 		/*
 		 * The diff code parsed --output; it has already opened the
-		 * file, but but we must instruct it not to close after each
-		 * diff.
+		 * file, but we must instruct it not to close after each diff.
 		 */
 		rev.diffopt.no_free = 1;
 	} else {
diff --git a/git-compat-util.h b/git-compat-util.h
index a508dbe5a3..df7dae9be1 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -1368,7 +1368,7 @@ static inline void *container_of_or_null_offset(void *ptr, size_t offset)
 	(type *)container_of_or_null_offset(ptr, offsetof(type, member))
 
 /*
- * like offsetof(), but takes a pointer to a a variable of type which
+ * like offsetof(), but takes a pointer to a variable of type which
  * contains @member, instead of a specified type.
  * @ptr is subject to multiple evaluation since we can't rely on __typeof__
  * everywhere.
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index f6f3fc192c..ed035f32c2 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -2149,7 +2149,7 @@ sub req_diff
                    ( $meta2->{revision} or "workingcopy" ));
 
         # TODO: Use --label instead of -L because -L is no longer
-        #  documented and may go away someday.  Not sure if there there are
+        #  documented and may go away someday.  Not sure if there are
         #  versions that only support -L, which would make this change risky?
         #  http://osdir.com/ml/bug-gnu-utils-gnu/2010-12/msg00060.html
         #    ("man diff" should actually document the best migration strategy,
diff --git a/merge-recursive.c b/merge-recursive.c
index d146bb116f..4327e0cfa3 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2152,7 +2152,7 @@ static char *handle_path_level_conflicts(struct merge_options *opt,
  *      implicit renaming of files that should be left in place.  (See
  *      testcase 6b in t6043 for details.)
  *   2. Prune directory renames if there are still files left in the
- *      the original directory.  These represent a partial directory rename,
+ *      original directory.  These represent a partial directory rename,
  *      i.e. a rename where only some of the files within the directory
  *      were renamed elsewhere.  (Technically, this could be done earlier
  *      in get_directory_renames(), except that would prevent us from
diff --git a/remote.c b/remote.c
index 6d1e8d02df..dfb863d808 100644
--- a/remote.c
+++ b/remote.c
@@ -1592,7 +1592,7 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
 			else
 				/*
 				 * If the ref isn't stale, and is reachable
-				 * from from one of the reflog entries of
+				 * from one of the reflog entries of
 				 * the local branch, force the update.
 				 */
 				force_ref_update = 1;
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index c7b392794b..e6e3c8f552 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -182,7 +182,7 @@ test_expect_success 'rename errors out early when deleting non-existent branch'
 	)
 '
 
-test_expect_success 'rename errors out early when when new name is invalid' '
+test_expect_success 'rename errors out early when new name is invalid' '
 	test_config remote.foo.vcs bar &&
 	echo "fatal: '\''invalid...name'\'' is not a valid remote name" >expect &&
 	test_must_fail git remote rename foo invalid...name 2>actual &&
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index 1d3fdcc997..ef35a54885 100755
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -330,7 +330,7 @@ test_expect_success 'git-svn works in a bare repository' '
 	git svn fetch ) &&
 	rm -rf bare-repo
 	'
-test_expect_success 'git-svn works in in a repository with a gitdir: link' '
+test_expect_success 'git-svn works in a repository with a gitdir: link' '
 	mkdir worktree gitdir &&
 	( cd worktree &&
 	git svn init "$svnrepo" &&
-- 
2.31.1

Re: [PATCH v3] *: fix typos which duplicate a word

[Junio C Hamano]

Andrei Rybak <rybak.a.v@gmail.com> writes:

> Fix typos in documentation, code comments, and RelNotes which repeat
> various words.  In trivial cases, just delete the duplicated word and
> rewrap text, if needed.  Reword the affected sentence in
> Documentation/RelNotes/1.8.4.txt for it to make sense.

Thanks.  I usually avoid touching published release notes (it is not
like we'd issue 1.8.4.1 maintenance release to apply this typofix),
but as you spent time to fix them all, and as we spent time to review
the changes, let's take all of them.

>   * Invocations of "git checkout" used internally by "git rebase" were
> -   counted as "checkout", and affected later "git checkout -" to the
> +   counted as "checkout", and affected later "git checkout -" which took
>     the user to an unexpected place.
>     (merge 3bed291 rr/rebase-checkout-reflog later to maint).

I think this one actually wanted to say "affected later X to take
the user to an unexpected place", but ", which" is OK, too.

Thanks.

[PATCH] *: fix typos which duplicate a word

[Andrei Rybak]

Fix typos in code comments which repeat various words.  Most of the
cases are simple in that they repeat a word that usually cannot be
repeated in a grammatically correct sentence.  Just remove the
incorrectly duplicated word in these cases and rewrap text, if needed.

A tricky case is usage of "that that", which is sometimes grammatically
correct.  However, an instance of this in "t7527-builtin-fsmonitor.sh"
doesn't need two words "that", because there is only one daemon being
discussed, so the word "daemon" does not need a determiner.

Reword code comment "entries exist on on-disk index" in function
update_one in file cache-tree.c, by replacing incorrect preposition "on"
with "in".

Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>
---
 Documentation/gitprotocol-v2.txt | 2 +-
 builtin/checkout.c               | 2 +-
 builtin/submodule--helper.c      | 5 ++---
 cache-tree.c                     | 2 +-
 config.c                         | 2 +-
 run-command.c                    | 2 +-
 t/t4301-merge-tree-write-tree.sh | 4 ++--
 t/t6421-merge-partial-clone.sh   | 4 ++--
 t/t7527-builtin-fsmonitor.sh     | 4 ++--
 9 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Documentation/gitprotocol-v2.txt b/Documentation/gitprotocol-v2.txt
index 10bd2d40ce..acb97ad0c2 100644
--- a/Documentation/gitprotocol-v2.txt
+++ b/Documentation/gitprotocol-v2.txt
@@ -665,7 +665,7 @@ headers and their prerequisite relationships, or something else.
 +
 Server operators should feel confident in turning on "bundle-uri" and
 not worry if e.g. their CDN goes down that clones or fetches will run
-into hard failures. Even if the server bundle bundle(s) are
+into hard failures. Even if the server bundle(s) are
 incomplete, or bad in some way the client should still end up with a
 functioning repository, just as if it had chosen not to use this
 protocol extension.
diff --git a/builtin/checkout.c b/builtin/checkout.c
index cd04f0bf57..5963e1b74b 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -1270,7 +1270,7 @@ static int parse_branchname_arg(int argc, const char **argv,
 	 *       between A and B, A...B names that merge base.
 	 *
 	 *   (b) If <something> is _not_ a commit, either "--" is present
-	 *       or <something> is not a path, no -t or -b was given, and
+	 *       or <something> is not a path, no -t or -b was given,
 	 *       and there is a tracking branch whose name is <something>
 	 *       in one and only one remote (or if the branch exists on the
 	 *       remote named in checkout.defaultRemote), then this is a
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 450680fc70..4c173d8b37 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -3219,9 +3219,8 @@ static void die_on_index_match(const char *path, int force)
 		ensure_full_index(&the_index);
 
 		/*
-		 * Since there is only one pathspec, we just need
-		 * need to check ps_matched[0] to know if a cache
-		 * entry matched.
+		 * Since there is only one pathspec, we just need to
+		 * check ps_matched[0] to know if a cache entry matched.
 		 */
 		for (i = 0; i < the_index.cache_nr; i++) {
 			ce_path_match(&the_index, the_index.cache[i], &ps,
diff --git a/cache-tree.c b/cache-tree.c
index c97111cccf..9af457f47c 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -405,7 +405,7 @@ static int update_one(struct cache_tree *it,
 		}
 
 		/*
-		 * CE_INTENT_TO_ADD entries exist on on-disk index but
+		 * CE_INTENT_TO_ADD entries exist in on-disk index but
 		 * they are not part of generated trees. Invalidate up
 		 * to root to force cache-tree users to read elsewhere.
 		 */
diff --git a/config.c b/config.c
index 27f38283ad..00090a32fc 100644
--- a/config.c
+++ b/config.c
@@ -3154,7 +3154,7 @@ int git_config_set_gently(const char *key, const char *value)
 int repo_config_set_worktree_gently(struct repository *r,
 				    const char *key, const char *value)
 {
-	/* Only use worktree-specific config if it is is already enabled. */
+	/* Only use worktree-specific config if it is already enabled. */
 	if (repository_format_worktree_config) {
 		char *file = repo_git_path(r, "config.worktree");
 		int ret = git_config_set_multivar_in_file_gently(
diff --git a/run-command.c b/run-command.c
index 756f1839aa..50cc011654 100644
--- a/run-command.c
+++ b/run-command.c
@@ -1853,7 +1853,7 @@ enum start_bg_result start_bg_command(struct child_process *cmd,
 		 *
 		 * We also assume that `start_command()` does not add
 		 * us to the cleanup list.  And that it calls
-		 * calls `child_process_clear()`.
+		 * `child_process_clear()`.
 		 */
 		sbgr = SBGR_ERROR;
 		goto done;
diff --git a/t/t4301-merge-tree-write-tree.sh b/t/t4301-merge-tree-write-tree.sh
index a8983a0edc..250f721795 100755
--- a/t/t4301-merge-tree-write-tree.sh
+++ b/t/t4301-merge-tree-write-tree.sh
@@ -141,7 +141,7 @@ test_expect_success 'test conflict notices and such' '
 #   Commit O: foo, olddir/{a,b,c}
 #   Commit A: modify foo, newdir/{a,b,c}
 #   Commit B: modify foo differently & rename foo -> olddir/bar
-#   Expected: CONFLICT(content) for for newdir/bar (not olddir/bar or foo)
+#   Expected: CONFLICT(content) for newdir/bar (not olddir/bar or foo)
 
 test_expect_success 'directory rename + content conflict' '
 	# Setup
@@ -653,7 +653,7 @@ test_expect_success 'mod6: chains of rename/rename(1to2) and add/add via collidi
 #   Commit O: foo, olddir/{a,b,c}
 #   Commit A: delete foo, rename olddir/ -> newdir/, add newdir/bar/file
 #   Commit B: modify foo & rename foo -> olddir/bar
-#   Expected: CONFLICT(content) for for newdir/bar (not olddir/bar or foo)
+#   Expected: CONFLICT(content) for newdir/bar (not olddir/bar or foo)
 
 test_expect_success 'directory rename + rename/delete + modify/delete + directory/file conflict' '
 	# Setup
diff --git a/t/t6421-merge-partial-clone.sh b/t/t6421-merge-partial-clone.sh
index 5413e5dd9d..711b709e75 100755
--- a/t/t6421-merge-partial-clone.sh
+++ b/t/t6421-merge-partial-clone.sh
@@ -155,7 +155,7 @@ test_setup_repo () {
 #   Commit A:
 #     (Rename leap->jump, rename basename/ -> basename/subdir/, rename dir/
 #      -> folder/, move e into newsubdir, add newfile.rs, remove f, modify
-#      both both Makefiles and jumps)
+#      both Makefiles and jumps)
 #              general/{jump1_A, jump2_A}
 #              basename/subdir/{numbers_A, sequence_A, values_A}
 #              folder/subdir/{a,b,c,d,Makefile_TOP_A}
@@ -343,7 +343,7 @@ test_expect_merge_algorithm failure success 'Objects downloaded when a directory
 #   Commit A:
 #     (Rename leap->jump, rename basename/ -> basename/subdir/, rename dir/
 #      -> folder/, move e into newsubdir, add newfile.rs, remove f, modify
-#      both both Makefiles and jumps)
+#      both Makefiles and jumps)
 #              general/{jump1_A, jump2_A}
 #              basename/subdir/{numbers_A, sequence_A, values_A}
 #              folder/subdir/{a,b,c,d,Makefile_TOP_A}
diff --git a/t/t7527-builtin-fsmonitor.sh b/t/t7527-builtin-fsmonitor.sh
index 76d0220daa..f9aad19d1c 100755
--- a/t/t7527-builtin-fsmonitor.sh
+++ b/t/t7527-builtin-fsmonitor.sh
@@ -904,7 +904,7 @@ test_expect_success "submodule absorbgitdirs implicitly starts daemon" '
 
 # On a case-insensitive file system, confirm that the daemon
 # notices when the .git directory is moved/renamed/deleted
-# regardless of how it is spelled in the the FS event.
+# regardless of how it is spelled in the FS event.
 # That is, does the FS event receive the spelling of the
 # operation or does it receive the spelling preserved with
 # the file/directory.
@@ -922,7 +922,7 @@ test_expect_success CASE_INSENSITIVE_FS 'case insensitive+preserving' '
 	test_path_is_dir test_insensitive/.git &&
 	test_path_is_dir test_insensitive/.GIT &&
 
-	# Rename .git using an alternate spelling to verify that that
+	# Rename .git using an alternate spelling to verify that
 	# daemon detects it and automatically shuts down.
 	mv test_insensitive/.GIT test_insensitive/.FOO &&
 
-- 
2.38.1

Re: [PATCH] *: fix typos which duplicate a word

[Eric Sunshine]

On Fri, Jan 6, 2023 at 8:16 AM Andrei Rybak <rybak.a.v@gmail.com> wrote:
> Fix typos in code comments which repeat various words.  Most of the
> cases are simple in that they repeat a word that usually cannot be
> repeated in a grammatically correct sentence.  Just remove the
> incorrectly duplicated word in these cases and rewrap text, if needed.
>
> Reword code comment "entries exist on on-disk index" in function
> update_one in file cache-tree.c, by replacing incorrect preposition "on"
> with "in".

Thanks, these all look sensible.

> A tricky case is usage of "that that", which is sometimes grammatically
> correct.  However, an instance of this in "t7527-builtin-fsmonitor.sh"
> doesn't need two words "that", because there is only one daemon being
> discussed, so the word "daemon" does not need a determiner.

But...

> Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>
> ---
> diff --git a/t/t7527-builtin-fsmonitor.sh b/t/t7527-builtin-fsmonitor.sh
> @@ -922,7 +922,7 @@ test_expect_success CASE_INSENSITIVE_FS 'case insensitive+preserving' '
> -       # Rename .git using an alternate spelling to verify that that
> +       # Rename .git using an alternate spelling to verify that
>         # daemon detects it and automatically shuts down.
>         mv test_insensitive/.GIT test_insensitive/.FOO &&

... this doesn't read as well following the change. It would read well
if you changed it to "that the".

Not related to your patch at all, but I notice in this test that the
call to test_when_finished() is commented out:

    # test_when_finished "stop_daemon_delete_repo test_insensitive" &&

which makes me wonder if it was commented out while the test was being
debugged but then forgotten, and that the script is now potentially
leaking a running daemon if something in the test fails after the
daemon was started, or if the daemon does not shut down on its own as
it's supposed to do. [cc:+Jeff Hostetler]

Re: [PATCH] *: fix typos which duplicate a word

[Junio C Hamano]

Andrei Rybak <rybak.a.v@gmail.com> writes:

> A tricky case is usage of "that that", which is sometimes grammatically
> correct.  However, an instance of this in "t7527-builtin-fsmonitor.sh"
> doesn't need two words "that", because there is only one daemon being
> discussed, so the word "daemon" does not need a determiner.

Makes me wonder if it is more appropriage to replace the second
"that" with "the" there, then.

Other than that, everything else in the patch looks good.