{"thread":{"id":"52387","subject":"[PATCH 0/1] fix-typo: consecutive-word duplications","startedAt":"2019-12-05T03:45:08Z","lastAt":"2019-12-15T15:12:30Z","messageCount":5,"participants":["ryenus via GitGitGadget","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":1},"messages":[{"id":"387543","messageId":"pull.482.git.1575517503.gitgitgadget@gmail.com","threadId":"52387","inReplyTo":null,"subject":"[PATCH 0/1] fix-typo: consecutive-word duplications","fromName":"ryenus via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-12-05T03:45:02Z","receivedAt":"2019-12-05T03:45:08Z","isPatch":true,"sender":{"key":"ryenus@gmail.com","avatar":"https://avatars.githubusercontent.com/u/610161?v=4"},"body":"This fixes unintentional duplication(s) of words, such as the the, and can\ncan etc. I also take the chance to make a few wording tweaks to avoid\nsuspicious duplication(s).\n\nryenus (1):\n  fix-typo: consecutive-word duplications\n\n Documentation/RelNotes/2.13.0.txt | 2 +-\n Documentation/RelNotes/2.7.3.txt  | 2 +-\n Makefile                          | 2 +-\n convert.c                         | 2 +-\n graph.c                           | 2 +-\n submodule-config.c                | 2 +-\n t/t5314-pack-cycle-detection.sh   | 2 +-\n 7 files changed, 7 insertions(+), 7 deletions(-)\n\n\nbase-commit: 228f53135a4a41a37b6be8e4d6e2b6153db4a8ed\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-482%2Fryenus%2Ffix-typo-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-482/ryenus/fix-typo-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/482\n-- \ngitgitgadget\n"},{"id":"387544","messageId":"abb9e55ad5ef72242ee97e03316827b55ef2f4c8.1575517503.git.gitgitgadget@gmail.com","threadId":"52387","inReplyTo":"pull.482.git.1575517503.gitgitgadget@gmail.com","subject":"[PATCH 1/1] fix-typo: consecutive-word duplications","fromName":"ryenus via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-12-05T03:45:03Z","receivedAt":"2019-12-05T03:45:10Z","isPatch":true,"sender":{"key":"ryenus@gmail.com","avatar":"https://avatars.githubusercontent.com/u/610161?v=4"},"body":"From: ryenus <ryenus@gmail.com>\n\nCorrect unintentional duplication(s) of words, such as \"the the\",\nand \"can can\" etc.\n\nIn certain cases, the repeated words are suspicious but actually ok,\nand if some alternative wording exists and might be an improvement,\nthen the alternative wording is used, for example:\n\"we didn't do so so far\" becomes \"we didn't do that so far\".\n\nSigned-off-by: ryenus <ryenus@gmail.com>\n---\n Documentation/RelNotes/2.13.0.txt | 2 +-\n Documentation/RelNotes/2.7.3.txt  | 2 +-\n Makefile                          | 2 +-\n convert.c                         | 2 +-\n graph.c                           | 2 +-\n submodule-config.c                | 2 +-\n t/t5314-pack-cycle-detection.sh   | 2 +-\n 7 files changed, 7 insertions(+), 7 deletions(-)\n\ndiff --git a/Documentation/RelNotes/2.13.0.txt b/Documentation/RelNotes/2.13.0.txt\nindex 2a47b4cb0c..496a68192f 100644\n--- a/Documentation/RelNotes/2.13.0.txt\n+++ b/Documentation/RelNotes/2.13.0.txt\n@@ -38,7 +38,7 @@ UI, Workflows & Features\n \n  * Deletion of a branch \"foo/bar\" could remove .git/refs/heads/foo\n    once there no longer is any other branch whose name begins with\n-   \"foo/\", but we didn't do so so far.  Now we do.\n+   \"foo/\", but we didn't do that so far.  Now we do.\n \n  * When \"git merge\" detects a path that is renamed in one history\n    while the other history deleted (or modified) it, it now reports\ndiff --git a/Documentation/RelNotes/2.7.3.txt b/Documentation/RelNotes/2.7.3.txt\nindex 6adf038915..f618d71efd 100644\n--- a/Documentation/RelNotes/2.7.3.txt\n+++ b/Documentation/RelNotes/2.7.3.txt\n@@ -20,7 +20,7 @@ Fixes since v2.7.2\n    tests.\n \n  * \"git show 'HEAD:Foo[BAR]Baz'\" did not interpret the argument as a\n-   rev, i.e. the object named by the the pathname with wildcard\n+   rev, i.e. the object named by the pathname with wildcard\n    characters in a tree object.\n \n  * \"git rev-parse --git-common-dir\" used in the worktree feature\ndiff --git a/Makefile b/Makefile\nindex 44997f6f57..664ab01b1c 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -481,7 +481,7 @@ all::\n #\n # When DEVELOPER is set, DEVOPTS can be used to control compiler\n # options.  This variable contains keywords separated by\n-# whitespace. The following keywords are are recognized:\n+# whitespace. The following keywords are recognized:\n #\n #    no-error:\n #\ndiff --git a/convert.c b/convert.c\nindex 797e0bd0b1..25d9338429 100644\n--- a/convert.c\n+++ b/convert.c\n@@ -15,7 +15,7 @@\n  *\n  * This should use the pathname to decide on whether it wants to do some\n  * more interesting conversions (automatic gzip/unzip, general format\n- * conversions etc etc), but by default it just does automatic CRLF<->LF\n+ * conversions etc), but by default it just does automatic CRLF<->LF\n  * translation when the \"text\" attribute or \"auto_crlf\" option is set.\n  */\n \ndiff --git a/graph.c b/graph.c\nindex e3fd0ea5f8..5da111f567 100644\n--- a/graph.c\n+++ b/graph.c\n@@ -218,7 +218,7 @@ struct git_graph {\n \tint merge_layout;\n \t/*\n \t * The number of columns added to the graph by the current commit. For\n-\t * 2-way and octopus merges, this is is usually one less than the\n+\t * 2-way and octopus merges, this is usually one less than the\n \t * number of parents:\n \t *\n \t * \t\t| | |\t\t\t| |    \\\ndiff --git a/submodule-config.c b/submodule-config.c\nindex 401a9b2382..6bb8e65c26 100644\n--- a/submodule-config.c\n+++ b/submodule-config.c\n@@ -618,7 +618,7 @@ static void submodule_cache_check_init(struct repository *repo)\n \n /*\n  * Note: This function is private for a reason, the '.gitmodules' file should\n- * not be used as as a mechanism to retrieve arbitrary configuration stored in\n+ * not be used as a mechanism to retrieve arbitrary configuration stored in\n  * the repository.\n  *\n  * Runs the provided config function on the '.gitmodules' file found in the\ndiff --git a/t/t5314-pack-cycle-detection.sh b/t/t5314-pack-cycle-detection.sh\nindex e525466de0..0aec8619e2 100755\n--- a/t/t5314-pack-cycle-detection.sh\n+++ b/t/t5314-pack-cycle-detection.sh\n@@ -53,7 +53,7 @@ immediately after the lookup for \"dummy\".\n \n \n \n-# Create a pack containing the the tree $1 and blob $1:file, with\n+# Create a pack containing the tree $1 and blob $1:file, with\n # the latter stored as a delta against $2:file.\n #\n # We convince pack-objects to make the delta in the direction of our choosing\n-- \ngitgitgadget\n"},{"id":"387558","messageId":"xmqqblsm273m.fsf@gitster-ct.c.googlers.com","threadId":"52387","inReplyTo":"abb9e55ad5ef72242ee97e03316827b55ef2f4c8.1575517503.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 1/1] fix-typo: consecutive-word duplications","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-12-05T14:13:33Z","receivedAt":"2019-12-05T14:13:37Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"ryenus via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n\n> From: ryenus <ryenus@gmail.com>\n>\n> Correct unintentional duplication(s) of words, such as \"the the\",\n> and \"can can\" etc.\n\nUnderstood.\n\nI would rather honor the original when it is not clearly wrong,\nmisleading to readers or prone to misunderstanding.  Hence, I'd\nrather not change this particular one.\n\n> \"we didn't do so so far\" becomes \"we didn't do that so far\".\n\nAnd also this one.\n\n>   * This should use the pathname to decide on whether it wants to do some\n>   * more interesting conversions (automatic gzip/unzip, general format\n> - * conversions etc etc), but by default it just does automatic CRLF<->LF\n> + * conversions etc), but by default it just does automatic CRLF<->LF\n\nEverything else in this patch is improving what is clearly wrong and\nis very much appreciated, though.\n\nJust a reminder, as I do not know your cultural background so ryenus\nin all lowercase may be your real name, in which case please ignore\nthis part of the response, but Documentation/SubmittingPatches says\n\n    [[real-name]]\n    Also notice that a real name is used in the Signed-off-by: line. Please\n    don't hide your real name.\n\nabout the Signed-off-by: line.\n\nThanks.\n"},{"id":"388228","messageId":"pull.482.v2.git.1576422744.gitgitgadget@gmail.com","threadId":"52387","inReplyTo":"pull.482.git.1575517503.gitgitgadget@gmail.com","subject":"[PATCH v2 0/1] fix-typo: consecutive-word duplications","fromName":"ryenus via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-12-15T15:12:23Z","receivedAt":"2019-12-15T15:12:30Z","isPatch":true,"sender":{"key":"ryenus@gmail.com","avatar":"https://avatars.githubusercontent.com/u/610161?v=4"},"body":"This fixes unintentional duplication(s) of words, such as the the, and can\ncan etc. I also take the chance to make a few wording tweaks to avoid\nsuspicious duplication(s).\n\nryenus (1):\n  fix-typo: consecutive-word duplications\n\n Documentation/RelNotes/2.7.3.txt | 2 +-\n Makefile                         | 2 +-\n graph.c                          | 2 +-\n submodule-config.c               | 2 +-\n t/t5314-pack-cycle-detection.sh  | 2 +-\n 5 files changed, 5 insertions(+), 5 deletions(-)\n\n\nbase-commit: ad05a3d8e5a6a06443836b5e40434262d992889a\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-482%2Fryenus%2Ffix-typo-v2\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-482/ryenus/fix-typo-v2\nPull-Request: https://github.com/gitgitgadget/git/pull/482\n\nRange-diff vs v1:\n\n 1:  abb9e55ad5 ! 1:  3180741259 fix-typo: consecutive-word duplications\n     @@ -5,26 +5,14 @@\n          Correct unintentional duplication(s) of words, such as \"the the\",\n          and \"can can\" etc.\n      \n     -    In certain cases, the repeated words are suspicious but actually ok,\n     -    and if some alternative wording exists and might be an improvement,\n     -    then the alternative wording is used, for example:\n     -    \"we didn't do so so far\" becomes \"we didn't do that so far\".\n     +    The changes are only applied to cases where it's fixing what is clearly\n     +    wrong or prone to misunderstanding, as suggested by the reviewers.\n      \n     +    Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n     +    Helped-by: Denton Liu <liu.denton@gmail.com>\n     +    Helped-by: Junio C Hamano <gitster@pobox.com>\n          Signed-off-by: ryenus <ryenus@gmail.com>\n      \n     - diff --git a/Documentation/RelNotes/2.13.0.txt b/Documentation/RelNotes/2.13.0.txt\n     - --- a/Documentation/RelNotes/2.13.0.txt\n     - +++ b/Documentation/RelNotes/2.13.0.txt\n     -@@\n     - \n     -  * Deletion of a branch \"foo/bar\" could remove .git/refs/heads/foo\n     -    once there no longer is any other branch whose name begins with\n     --   \"foo/\", but we didn't do so so far.  Now we do.\n     -+   \"foo/\", but we didn't do that so far.  Now we do.\n     - \n     -  * When \"git merge\" detects a path that is renamed in one history\n     -    while the other history deleted (or modified) it, it now reports\n     -\n       diff --git a/Documentation/RelNotes/2.7.3.txt b/Documentation/RelNotes/2.7.3.txt\n       --- a/Documentation/RelNotes/2.7.3.txt\n       +++ b/Documentation/RelNotes/2.7.3.txt\n     @@ -51,19 +39,6 @@\n       #    no-error:\n       #\n      \n     - diff --git a/convert.c b/convert.c\n     - --- a/convert.c\n     - +++ b/convert.c\n     -@@\n     -  *\n     -  * This should use the pathname to decide on whether it wants to do some\n     -  * more interesting conversions (automatic gzip/unzip, general format\n     -- * conversions etc etc), but by default it just does automatic CRLF<->LF\n     -+ * conversions etc), but by default it just does automatic CRLF<->LF\n     -  * translation when the \"text\" attribute or \"auto_crlf\" option is set.\n     -  */\n     - \n     -\n       diff --git a/graph.c b/graph.c\n       --- a/graph.c\n       +++ b/graph.c\n\n-- \ngitgitgadget\n"},{"id":"388229","messageId":"318074125990be47843cfa54b4276f93edde0ec5.1576422744.git.gitgitgadget@gmail.com","threadId":"52387","inReplyTo":"pull.482.v2.git.1576422744.gitgitgadget@gmail.com","subject":"[PATCH v2 1/1] fix-typo: consecutive-word duplications","fromName":"ryenus via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-12-15T15:12:24Z","receivedAt":"2019-12-15T15:12:30Z","isPatch":true,"sender":{"key":"ryenus@gmail.com","avatar":"https://avatars.githubusercontent.com/u/610161?v=4"},"body":"From: ryenus <ryenus@gmail.com>\n\nCorrect unintentional duplication(s) of words, such as \"the the\",\nand \"can can\" etc.\n\nThe changes are only applied to cases where it's fixing what is clearly\nwrong or prone to misunderstanding, as suggested by the reviewers.\n\nHelped-by: Johannes Schindelin <johannes.schindelin@gmx.de>\nHelped-by: Denton Liu <liu.denton@gmail.com>\nHelped-by: Junio C Hamano <gitster@pobox.com>\nSigned-off-by: ryenus <ryenus@gmail.com>\n---\n Documentation/RelNotes/2.7.3.txt | 2 +-\n Makefile                         | 2 +-\n graph.c                          | 2 +-\n submodule-config.c               | 2 +-\n t/t5314-pack-cycle-detection.sh  | 2 +-\n 5 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/RelNotes/2.7.3.txt b/Documentation/RelNotes/2.7.3.txt\nindex 6adf038915..f618d71efd 100644\n--- a/Documentation/RelNotes/2.7.3.txt\n+++ b/Documentation/RelNotes/2.7.3.txt\n@@ -20,7 +20,7 @@ Fixes since v2.7.2\n    tests.\n \n  * \"git show 'HEAD:Foo[BAR]Baz'\" did not interpret the argument as a\n-   rev, i.e. the object named by the the pathname with wildcard\n+   rev, i.e. the object named by the pathname with wildcard\n    characters in a tree object.\n \n  * \"git rev-parse --git-common-dir\" used in the worktree feature\ndiff --git a/Makefile b/Makefile\nindex b7d7374dac..42a061d3fb 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -481,7 +481,7 @@ all::\n #\n # When DEVELOPER is set, DEVOPTS can be used to control compiler\n # options.  This variable contains keywords separated by\n-# whitespace. The following keywords are are recognized:\n+# whitespace. The following keywords are recognized:\n #\n #    no-error:\n #\ndiff --git a/graph.c b/graph.c\nindex e3fd0ea5f8..5da111f567 100644\n--- a/graph.c\n+++ b/graph.c\n@@ -218,7 +218,7 @@ struct git_graph {\n \tint merge_layout;\n \t/*\n \t * The number of columns added to the graph by the current commit. For\n-\t * 2-way and octopus merges, this is is usually one less than the\n+\t * 2-way and octopus merges, this is usually one less than the\n \t * number of parents:\n \t *\n \t * \t\t| | |\t\t\t| |    \\\ndiff --git a/submodule-config.c b/submodule-config.c\nindex b93482d834..85064810b2 100644\n--- a/submodule-config.c\n+++ b/submodule-config.c\n@@ -626,7 +626,7 @@ static void submodule_cache_check_init(struct repository *repo)\n \n /*\n  * Note: This function is private for a reason, the '.gitmodules' file should\n- * not be used as as a mechanism to retrieve arbitrary configuration stored in\n+ * not be used as a mechanism to retrieve arbitrary configuration stored in\n  * the repository.\n  *\n  * Runs the provided config function on the '.gitmodules' file found in the\ndiff --git a/t/t5314-pack-cycle-detection.sh b/t/t5314-pack-cycle-detection.sh\nindex e525466de0..0aec8619e2 100755\n--- a/t/t5314-pack-cycle-detection.sh\n+++ b/t/t5314-pack-cycle-detection.sh\n@@ -53,7 +53,7 @@ immediately after the lookup for \"dummy\".\n \n \n \n-# Create a pack containing the the tree $1 and blob $1:file, with\n+# Create a pack containing the tree $1 and blob $1:file, with\n # the latter stored as a delta against $2:file.\n #\n # We convince pack-objects to make the delta in the direction of our choosing\n-- \ngitgitgadget\n"}]}