{"thread":{"id":"53946","subject":"[PATCH] comment: fix spelling mistakes inside comments","startedAt":"2020-07-29T03:33:33Z","lastAt":"2020-07-29T19:19:36Z","messageCount":5,"participants":["Steve Kemp via GitGitGadget","Derrick Stolee","Steve Kemp","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"402324","messageId":"pull.685.git.1595993608886.gitgitgadget@gmail.com","threadId":"53946","inReplyTo":null,"subject":"[PATCH] comment: fix spelling mistakes inside comments","fromName":"Steve Kemp via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-07-29T03:33:28Z","receivedAt":"2020-07-29T03:33:33Z","isPatch":true,"sender":{"key":"steve@steve.org.uk","avatar":null},"body":"From: Steve Kemp \n\nThis commit fixes a couple of minor spelling mistakes inside\ncomments.\n\nSigned-off-by: Steve Kemp \nSigned-off-by: Steve Kemp \n---\n comment: Fix spelling mistakes inside comments\n \n This commit fixes a couple of minor spelling mistakes inside comments.\n \n Signed-off-by: Steve Kemp steve@steve.fi [steve@steve.fi]\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-685%2Fskx%2Fmaster-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-685/skx/master-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/685\n\n add-patch.c | 2 +-\n column.c | 2 +-\n grep.c | 2 +-\n ref-filter.c | 2 +-\n 4 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/add-patch.c b/add-patch.c\nindex f899389e2c..a1d66c1b75 100644\n--- a/add-patch.c\n+++ b/add-patch.c\n@@ -1203,7 +1203,7 @@ static int edit_hunk_loop(struct add_p_state *s,\n \tfor (;;) {\n \t\tint res = edit_hunk_manually(s, hunk);\n \t\tif (res == 0) {\n-\t\t\t/* abandonded */\n+\t\t\t/* abandoned */\n \t\t\t*hunk = backup;\n \t\t\treturn -1;\n \t\t}\ndiff --git a/column.c b/column.c\nindex 4a38eed322..a58969baba 100644\n--- a/column.c\n+++ b/column.c\n@@ -107,7 +107,7 @@ static void display_plain(const struct string_list *list,\n \t\tprintf(\"%s%s%s\", indent, list->items[i].string, nl);\n }\n \n-/* Print a cell to stdout with all necessary leading/traling space */\n+/* Print a cell to stdout with all necessary leading/trailing space */\n static int display_cell(struct column_data *data, int initial_width,\n \t\t\tconst char *empty_cell, int x, int y)\n {\ndiff --git a/grep.c b/grep.c\nindex 13232a904a..54af9f813e 100644\n--- a/grep.c\n+++ b/grep.c\n@@ -1817,7 +1817,7 @@ static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int colle\n \t\t * We might set up the shared textconv cache data here, which\n \t\t * is not thread-safe. Also, get_oid_with_context() and\n \t\t * parse_object() might be internally called. As they are not\n-\t\t * currenty thread-safe and might be racy with object reading,\n+\t\t * currently thread-safe and might be racy with object reading,\n \t\t * obj_read_lock() must be called.\n \t\t */\n \t\tgrep_attr_lock();\ndiff --git a/ref-filter.c b/ref-filter.c\nindex 8447cb09be..f836f3830c 100644\n--- a/ref-filter.c\n+++ b/ref-filter.c\n@@ -1980,7 +1980,7 @@ static int for_each_fullref_in_pattern(struct ref_filter *filter,\n * of oids. If the given ref is a tag, check if the given tag points\n * at one of the oids in the given oid array.\n * NEEDSWORK:\n- * 1. Only a single level of inderection is obtained, we might want to\n+ * 1. Only a single level of indirection is obtained, we might want to\n * change this to account for multiple levels (e.g. annotated tags\n * pointing to annotated tags pointing to a commit.)\n * 2. As the refs are cached we might know what refname peels to without\n\nbase-commit: 47ae905ffb98cc4d4fd90083da6bc8dab55d9ecc\n-- \ngitgitgadget\n"},{"id":"402332","messageId":"571792b3-e65b-e6e8-34b9-56a87a47de8d@gmail.com","threadId":"53946","inReplyTo":"pull.685.git.1595993608886.gitgitgadget@gmail.com","subject":"Re: [PATCH] comment: fix spelling mistakes inside comments","fromName":"Derrick Stolee","fromEmail":"stolee@gmail.com","sentAt":"2020-07-29T13:45:21Z","receivedAt":"2020-07-29T13:45:26Z","isPatch":true,"sender":{"key":"stolee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/570044?v=4"},"body":"On 7/28/20 11:33 PM, Steve Kemp via GitGitGadget wrote:\n> From: Steve Kemp \n> \n> This commit fixes a couple of minor spelling mistakes inside\n> comments.\n> \n> Signed-off-by: Steve Kemp \n> Signed-off-by: Steve Kemp \n\nDouble sign-off? Perhaps keep the org.uk version, since that\nis the email you use for authorship.\n\n> -\t\t\t/* abandonded */\n> +\t\t\t/* abandoned */\n\n> -/* Print a cell to stdout with all necessary leading/traling space */\n> +/* Print a cell to stdout with all necessary leading/trailing space */\n\n> -\t\t * currenty thread-safe and might be racy with object reading,\n> +\t\t * currently thread-safe and might be racy with object reading,\n\n> - * 1. Only a single level of inderection is obtained, we might want to\n> + * 1. Only a single level of indirection is obtained, we might want to\n\nThese edits are all positive ones.\n\nI'll leave it to more experienced contributors to comment on how a\ncomment-only patch fits with this section Documentation/CodingGuidelines:\n\n - Fixing style violations while working on a real change as a\n preparatory clean-up step is good, but otherwise avoid useless code\n churn for the sake of conforming to the style.\n\nIn my opinion, this change is not harmful, but also isn't super\nnecessary. I could go either way.\n\nThanks,\n-Stolee\n"},{"id":"402342","messageId":"CAHvqdm4Zj_US3ohNCcPzbKUocWp36jwgJ4KnGk9edn4NevuMNg@mail.gmail.com","threadId":"53946","inReplyTo":"571792b3-e65b-e6e8-34b9-56a87a47de8d@gmail.com","subject":"Re: [PATCH] comment: fix spelling mistakes inside comments","fromName":"Steve Kemp","fromEmail":"steve@steve.org.uk","sentAt":"2020-07-29T18:12:09Z","receivedAt":"2020-07-29T18:12:25Z","isPatch":true,"sender":{"key":"steve@steve.org.uk","avatar":null},"body":"On Wed, 29 Jul 2020 at 16:45, Derrick Stolee wrote:\n\n> Double sign-off? Perhaps keep the org.uk version, since that\n> is the email you use for authorship.\n\nSorry, thanks.\n\n> In my opinion, this change is not harmful, but also isn't super\n> necessary. I could go either way.\n\nIf it were a white-space change, or a some trivial style-guide fixup\nI'd have left it alone. As it is the patch fixes a couple of mistakes,\nalbeit trivial ones, I thought it was worth submitting.\n\nI'd be happy to see it merged, or dropped, whichever seems most\nappropriate. I appreciate it is internal and not user-visible, but\nwhen I read comments with typos in them they jump out!\n\nUpdated patch, trivially, below.\n\nSteve\n-- \n\n\nFrom: Steve Kemp \n\nThis commit fixes a couple of minor spelling mistakes inside\ncomments.\n\nSigned-off-by: Steve Kemp \n---\n comment: Fix spelling mistakes inside comments\n\n This commit fixes a couple of minor spelling mistakes inside comments.\n\n Signed-off-by: Steve Kemp steve@steve.fi [steve@steve.fi]\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-685%2Fskx%2Fmaster-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-685/skx/master-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/685\n\n add-patch.c | 2 +-\n column.c | 2 +-\n grep.c | 2 +-\n ref-filter.c | 2 +-\n 4 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/add-patch.c b/add-patch.c\nindex f899389e2c..a1d66c1b75 100644\n--- a/add-patch.c\n+++ b/add-patch.c\n@@ -1203,7 +1203,7 @@ static int edit_hunk_loop(struct add_p_state *s,\n for (;;) {\n int res = edit_hunk_manually(s, hunk);\n if (res == 0) {\n- /* abandonded */\n+ /* abandoned */\n *hunk = backup;\n return -1;\n }\ndiff --git a/column.c b/column.c\nindex 4a38eed322..a58969baba 100644\n--- a/column.c\n+++ b/column.c\n@@ -107,7 +107,7 @@ static void display_plain(const struct string_list *list,\n printf(\"%s%s%s\", indent, list->items[i].string, nl);\n }\n\n-/* Print a cell to stdout with all necessary leading/traling space */\n+/* Print a cell to stdout with all necessary leading/trailing space */\n static int display_cell(struct column_data *data, int initial_width,\n const char *empty_cell, int x, int y)\n {\ndiff --git a/grep.c b/grep.c\nindex 13232a904a..54af9f813e 100644\n--- a/grep.c\n+++ b/grep.c\n@@ -1817,7 +1817,7 @@ static int grep_source_1(struct grep_opt *opt,\nstruct grep_source *gs, int colle\n * We might set up the shared textconv cache data here, which\n * is not thread-safe. Also, get_oid_with_context() and\n * parse_object() might be internally called. As they are not\n- * currenty thread-safe and might be racy with object reading,\n+ * currently thread-safe and might be racy with object reading,\n * obj_read_lock() must be called.\n */\n grep_attr_lock();\ndiff --git a/ref-filter.c b/ref-filter.c\nindex 8447cb09be..f836f3830c 100644\n--- a/ref-filter.c\n+++ b/ref-filter.c\n@@ -1980,7 +1980,7 @@ static int for_each_fullref_in_pattern(struct\nref_filter *filter,\n * of oids. If the given ref is a tag, check if the given tag points\n * at one of the oids in the given oid array.\n * NEEDSWORK:\n- * 1. Only a single level of inderection is obtained, we might want to\n+ * 1. Only a single level of indirection is obtained, we might want to\n * change this to account for multiple levels (e.g. annotated tags\n * pointing to annotated tags pointing to a commit.)\n * 2. As the refs are cached we might know what refname peels to without\n\nbase-commit: 47ae905ffb98cc4d4fd90083da6bc8dab55d9ecc\n-- \ngitgitgadget\n"},{"id":"402343","messageId":"xmqq4kpqb301.fsf@gitster.c.googlers.com","threadId":"53946","inReplyTo":"571792b3-e65b-e6e8-34b9-56a87a47de8d@gmail.com","subject":"Re: [PATCH] comment: fix spelling mistakes inside comments","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-07-29T18:16:46Z","receivedAt":"2020-07-29T18:16:53Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Derrick Stolee writes:\n\n> I'll leave it to more experienced contributors to comment on how a\n> comment-only patch fits with this section Documentation/CodingGuidelines:\n>\n> - Fixing style violations while working on a real change as a\n> preparatory clean-up step is good, but otherwise avoid useless code\n> churn for the sake of conforming to the style.\n>\n> In my opinion, this change is not harmful, but also isn't super\n> necessary. I could go either way.\n\nTypofixes in comments has no chance of breaking things than a\ncarelessly done code churn made in the name of cleaning up, so\ncost-benefit comparison is much more favourable. I'm sure that I\nwon't be exhausted after reviewing comment-only patch as much as\nafter reviewing code-churn only patch.\n\n"},{"id":"402351","messageId":"2eeff10b-38e3-5d6d-6805-ff7920d52244@gmail.com","threadId":"53946","inReplyTo":"xmqq4kpqb301.fsf@gitster.c.googlers.com","subject":"Re: [PATCH] comment: fix spelling mistakes inside comments","fromName":"Derrick Stolee","fromEmail":"stolee@gmail.com","sentAt":"2020-07-29T19:19:32Z","receivedAt":"2020-07-29T19:19:36Z","isPatch":true,"sender":{"key":"stolee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/570044?v=4"},"body":"On 7/29/2020 2:16 PM, Junio C Hamano wrote:\n> Derrick Stolee writes:\n> \n>> I'll leave it to more experienced contributors to comment on how a\n>> comment-only patch fits with this section Documentation/CodingGuidelines:\n>>\n>> - Fixing style violations while working on a real change as a\n>> preparatory clean-up step is good, but otherwise avoid useless code\n>> churn for the sake of conforming to the style.\n>>\n>> In my opinion, this change is not harmful, but also isn't super\n>> necessary. I could go either way.\n> \n> Typofixes in comments has no chance of breaking things than a\n> carelessly done code churn made in the name of cleaning up, so\n> cost-benefit comparison is much more favourable. I'm sure that I\n> won't be exhausted after reviewing comment-only patch as much as\n> after reviewing code-churn only patch.\n\nThanks. I appreciate the context that provides more clarity.\n\nSteve's patch with the de-duplicated sign-off has my full support.\n\n-Stolee\n\n"}]}