[PATCH 0/1] fix-typo: consecutive-word duplications

[PATCH 0/1] fix-typo: consecutive-word duplications

[ryenus via GitGitGadget]

This fixes unintentional duplication(s) of words, such as the the, and can
can etc. I also take the chance to make a few wording tweaks to avoid
suspicious duplication(s).

ryenus (1):
  fix-typo: consecutive-word duplications

 Documentation/RelNotes/2.13.0.txt | 2 +-
 Documentation/RelNotes/2.7.3.txt  | 2 +-
 Makefile                          | 2 +-
 convert.c                         | 2 +-
 graph.c                           | 2 +-
 submodule-config.c                | 2 +-
 t/t5314-pack-cycle-detection.sh   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)


base-commit: 228f53135a4a41a37b6be8e4d6e2b6153db4a8ed
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-482%2Fryenus%2Ffix-typo-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-482/ryenus/fix-typo-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/482
-- 
gitgitgadget

[PATCH 1/1] fix-typo: consecutive-word duplications

[ryenus via GitGitGadget]

From: ryenus <ryenus@gmail.com>

Correct unintentional duplication(s) of words, such as "the the",
and "can can" etc.

In certain cases, the repeated words are suspicious but actually ok,
and if some alternative wording exists and might be an improvement,
then the alternative wording is used, for example:
"we didn't do so so far" becomes "we didn't do that so far".

Signed-off-by: ryenus <ryenus@gmail.com>
---
 Documentation/RelNotes/2.13.0.txt | 2 +-
 Documentation/RelNotes/2.7.3.txt  | 2 +-
 Makefile                          | 2 +-
 convert.c                         | 2 +-
 graph.c                           | 2 +-
 submodule-config.c                | 2 +-
 t/t5314-pack-cycle-detection.sh   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Documentation/RelNotes/2.13.0.txt b/Documentation/RelNotes/2.13.0.txt
index 2a47b4cb0c..496a68192f 100644
--- a/Documentation/RelNotes/2.13.0.txt
+++ b/Documentation/RelNotes/2.13.0.txt
@@ -38,7 +38,7 @@ UI, Workflows & Features
 
  * Deletion of a branch "foo/bar" could remove .git/refs/heads/foo
    once there no longer is any other branch whose name begins with
-   "foo/", but we didn't do so so far.  Now we do.
+   "foo/", but we didn't do that so far.  Now we do.
 
  * When "git merge" detects a path that is renamed in one history
    while the other history deleted (or modified) it, it now reports
diff --git a/Documentation/RelNotes/2.7.3.txt b/Documentation/RelNotes/2.7.3.txt
index 6adf038915..f618d71efd 100644
--- a/Documentation/RelNotes/2.7.3.txt
+++ b/Documentation/RelNotes/2.7.3.txt
@@ -20,7 +20,7 @@ Fixes since v2.7.2
    tests.
 
  * "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.
 
  * "git rev-parse --git-common-dir" used in the worktree feature
diff --git a/Makefile b/Makefile
index 44997f6f57..664ab01b1c 100644
--- a/Makefile
+++ b/Makefile
@@ -481,7 +481,7 @@ all::
 #
 # When DEVELOPER is set, DEVOPTS can be used to control compiler
 # options.  This variable contains keywords separated by
-# whitespace. The following keywords are are recognized:
+# whitespace. The following keywords are recognized:
 #
 #    no-error:
 #
diff --git a/convert.c b/convert.c
index 797e0bd0b1..25d9338429 100644
--- a/convert.c
+++ b/convert.c
@@ -15,7 +15,7 @@
  *
  * This should use the pathname to decide on whether it wants to do some
  * more interesting conversions (automatic gzip/unzip, general format
- * conversions etc etc), but by default it just does automatic CRLF<->LF
+ * conversions etc), but by default it just does automatic CRLF<->LF
  * translation when the "text" attribute or "auto_crlf" option is set.
  */
 
diff --git a/graph.c b/graph.c
index e3fd0ea5f8..5da111f567 100644
--- a/graph.c
+++ b/graph.c
@@ -218,7 +218,7 @@ struct git_graph {
 	int merge_layout;
 	/*
 	 * The number of columns added to the graph by the current commit. For
-	 * 2-way and octopus merges, this is is usually one less than the
+	 * 2-way and octopus merges, this is usually one less than the
 	 * number of parents:
 	 *
 	 * 		| | |			| |    \
diff --git a/submodule-config.c b/submodule-config.c
index 401a9b2382..6bb8e65c26 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -618,7 +618,7 @@ static void submodule_cache_check_init(struct repository *repo)
 
 /*
  * Note: This function is private for a reason, the '.gitmodules' file should
- * not be used as as a mechanism to retrieve arbitrary configuration stored in
+ * not be used as a mechanism to retrieve arbitrary configuration stored in
  * the repository.
  *
  * Runs the provided config function on the '.gitmodules' file found in the
diff --git a/t/t5314-pack-cycle-detection.sh b/t/t5314-pack-cycle-detection.sh
index e525466de0..0aec8619e2 100755
--- a/t/t5314-pack-cycle-detection.sh
+++ b/t/t5314-pack-cycle-detection.sh
@@ -53,7 +53,7 @@ immediately after the lookup for "dummy".
 
 
 
-# Create a pack containing the the tree $1 and blob $1:file, with
+# Create a pack containing the tree $1 and blob $1:file, with
 # the latter stored as a delta against $2:file.
 #
 # We convince pack-objects to make the delta in the direction of our choosing
-- 
gitgitgadget

Re: [PATCH 1/1] fix-typo: consecutive-word duplications

[Junio C Hamano]

"ryenus via GitGitGadget" <gitgitgadget@gmail.com> writes:

> From: ryenus <ryenus@gmail.com>
>
> Correct unintentional duplication(s) of words, such as "the the",
> and "can can" etc.

Understood.

I would rather honor the original when it is not clearly wrong,
misleading to readers or prone to misunderstanding.  Hence, I'd
rather not change this particular one.

> "we didn't do so so far" becomes "we didn't do that so far".

And also this one.

>   * This should use the pathname to decide on whether it wants to do some
>   * more interesting conversions (automatic gzip/unzip, general format
> - * conversions etc etc), but by default it just does automatic CRLF<->LF
> + * conversions etc), but by default it just does automatic CRLF<->LF

Everything else in this patch is improving what is clearly wrong and
is very much appreciated, though.

Just a reminder, as I do not know your cultural background so ryenus
in all lowercase may be your real name, in which case please ignore
this part of the response, but Documentation/SubmittingPatches says

    [[real-name]]
    Also notice that a real name is used in the Signed-off-by: line. Please
    don't hide your real name.

about the Signed-off-by: line.

Thanks.

[PATCH v2 0/1] fix-typo: consecutive-word duplications

[ryenus via GitGitGadget]

This fixes unintentional duplication(s) of words, such as the the, and can
can etc. I also take the chance to make a few wording tweaks to avoid
suspicious duplication(s).

ryenus (1):
  fix-typo: consecutive-word duplications

 Documentation/RelNotes/2.7.3.txt | 2 +-
 Makefile                         | 2 +-
 graph.c                          | 2 +-
 submodule-config.c               | 2 +-
 t/t5314-pack-cycle-detection.sh  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)


base-commit: ad05a3d8e5a6a06443836b5e40434262d992889a
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-482%2Fryenus%2Ffix-typo-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-482/ryenus/fix-typo-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/482

Range-diff vs v1:

 1:  abb9e55ad5 ! 1:  3180741259 fix-typo: consecutive-word duplications
     @@ -5,26 +5,14 @@
          Correct unintentional duplication(s) of words, such as "the the",
          and "can can" etc.
      
     -    In certain cases, the repeated words are suspicious but actually ok,
     -    and if some alternative wording exists and might be an improvement,
     -    then the alternative wording is used, for example:
     -    "we didn't do so so far" becomes "we didn't do that so far".
     +    The changes are only applied to cases where it's fixing what is clearly
     +    wrong or prone to misunderstanding, as suggested by the reviewers.
      
     +    Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de>
     +    Helped-by: Denton Liu <liu.denton@gmail.com>
     +    Helped-by: Junio C Hamano <gitster@pobox.com>
          Signed-off-by: ryenus <ryenus@gmail.com>
      
     - diff --git a/Documentation/RelNotes/2.13.0.txt b/Documentation/RelNotes/2.13.0.txt
     - --- a/Documentation/RelNotes/2.13.0.txt
     - +++ b/Documentation/RelNotes/2.13.0.txt
     -@@
     - 
     -  * Deletion of a branch "foo/bar" could remove .git/refs/heads/foo
     -    once there no longer is any other branch whose name begins with
     --   "foo/", but we didn't do so so far.  Now we do.
     -+   "foo/", but we didn't do that so far.  Now we do.
     - 
     -  * When "git merge" detects a path that is renamed in one history
     -    while the other history deleted (or modified) it, it now reports
     -
       diff --git a/Documentation/RelNotes/2.7.3.txt b/Documentation/RelNotes/2.7.3.txt
       --- a/Documentation/RelNotes/2.7.3.txt
       +++ b/Documentation/RelNotes/2.7.3.txt
     @@ -51,19 +39,6 @@
       #    no-error:
       #
      
     - diff --git a/convert.c b/convert.c
     - --- a/convert.c
     - +++ b/convert.c
     -@@
     -  *
     -  * This should use the pathname to decide on whether it wants to do some
     -  * more interesting conversions (automatic gzip/unzip, general format
     -- * conversions etc etc), but by default it just does automatic CRLF<->LF
     -+ * conversions etc), but by default it just does automatic CRLF<->LF
     -  * translation when the "text" attribute or "auto_crlf" option is set.
     -  */
     - 
     -
       diff --git a/graph.c b/graph.c
       --- a/graph.c
       +++ b/graph.c

-- 
gitgitgadget

[PATCH v2 1/1] fix-typo: consecutive-word duplications

[ryenus via GitGitGadget]

From: ryenus <ryenus@gmail.com>

Correct unintentional duplication(s) of words, such as "the the",
and "can can" etc.

The changes are only applied to cases where it's fixing what is clearly
wrong or prone to misunderstanding, as suggested by the reviewers.

Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Helped-by: Denton Liu <liu.denton@gmail.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: ryenus <ryenus@gmail.com>
---
 Documentation/RelNotes/2.7.3.txt | 2 +-
 Makefile                         | 2 +-
 graph.c                          | 2 +-
 submodule-config.c               | 2 +-
 t/t5314-pack-cycle-detection.sh  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Documentation/RelNotes/2.7.3.txt b/Documentation/RelNotes/2.7.3.txt
index 6adf038915..f618d71efd 100644
--- a/Documentation/RelNotes/2.7.3.txt
+++ b/Documentation/RelNotes/2.7.3.txt
@@ -20,7 +20,7 @@ Fixes since v2.7.2
    tests.
 
  * "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.
 
  * "git rev-parse --git-common-dir" used in the worktree feature
diff --git a/Makefile b/Makefile
index b7d7374dac..42a061d3fb 100644
--- a/Makefile
+++ b/Makefile
@@ -481,7 +481,7 @@ all::
 #
 # When DEVELOPER is set, DEVOPTS can be used to control compiler
 # options.  This variable contains keywords separated by
-# whitespace. The following keywords are are recognized:
+# whitespace. The following keywords are recognized:
 #
 #    no-error:
 #
diff --git a/graph.c b/graph.c
index e3fd0ea5f8..5da111f567 100644
--- a/graph.c
+++ b/graph.c
@@ -218,7 +218,7 @@ struct git_graph {
 	int merge_layout;
 	/*
 	 * The number of columns added to the graph by the current commit. For
-	 * 2-way and octopus merges, this is is usually one less than the
+	 * 2-way and octopus merges, this is usually one less than the
 	 * number of parents:
 	 *
 	 * 		| | |			| |    \
diff --git a/submodule-config.c b/submodule-config.c
index b93482d834..85064810b2 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -626,7 +626,7 @@ static void submodule_cache_check_init(struct repository *repo)
 
 /*
  * Note: This function is private for a reason, the '.gitmodules' file should
- * not be used as as a mechanism to retrieve arbitrary configuration stored in
+ * not be used as a mechanism to retrieve arbitrary configuration stored in
  * the repository.
  *
  * Runs the provided config function on the '.gitmodules' file found in the
diff --git a/t/t5314-pack-cycle-detection.sh b/t/t5314-pack-cycle-detection.sh
index e525466de0..0aec8619e2 100755
--- a/t/t5314-pack-cycle-detection.sh
+++ b/t/t5314-pack-cycle-detection.sh
@@ -53,7 +53,7 @@ immediately after the lookup for "dummy".
 
 
 
-# Create a pack containing the the tree $1 and blob $1:file, with
+# Create a pack containing the tree $1 and blob $1:file, with
 # the latter stored as a delta against $2:file.
 #
 # We convince pack-objects to make the delta in the direction of our choosing
-- 
gitgitgadget