fix-typo: consecutive-word duplications
Subsystems (2)
cover fix-typo: consecutive-word duplications
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
Signature · 1 line
gitgitgadget
PATCH 1/1 fix-typo: consecutive-word duplications
From: ryenus <[email protected]>
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".
--- 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(-)
Documentation/RelNotes/2.13.0.txt +1 -1
@@ -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
Documentation/RelNotes/2.7.3.txt +1 -1
@@ -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
Makefile +1 -1
@@ -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: #
convert.c +1 -1
@@ -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. */
graph.c +1 -1
@@ -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: * * | | | | | \
submodule-config.c +1 -1
@@ -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
t/t5314-pack-cycle-detection.sh +1 -1
@@ -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
Signature · 1 line
gitgitgadget
Quoted 4 lines · ryenus via GitGitGadget
From: ryenus <[email protected]>
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.
Quoted 1 line
"we didn't do so so far" becomes "we didn't do that so far".
And also this one.
Quoted 4 lines
* 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.
v2 cover fix-typo: consecutive-word duplications
In reply to ryenus via GitGitGadgetThis 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 <[email protected]>
+ Helped-by: Denton Liu <[email protected]>
+ Helped-by: Junio C Hamano <[email protected]>
- 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
Signature · 1 line
gitgitgadget
PATCH v2 1/1 fix-typo: consecutive-word duplications
From: ryenus <[email protected]>
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.
--- 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(-)
Documentation/RelNotes/2.7.3.txt +1 -1
@@ -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
Makefile +1 -1
@@ -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: #
graph.c +1 -1
@@ -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: * * | | | | | \
submodule-config.c +1 -1
@@ -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
t/t5314-pack-cycle-detection.sh +1 -1
@@ -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
Signature · 1 line
gitgitgadget