{"thread":{"id":"53941","subject":"[PATCH 0/2] Typo fixes","startedAt":"2020-07-28T20:45:45Z","lastAt":"2020-07-28T21:28:03Z","messageCount":5,"participants":["Elijah Newren via GitGitGadget","Taylor Blau","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"402244","messageId":"pull.824.git.git.1595969139.gitgitgadget@gmail.com","threadId":"53941","inReplyTo":null,"subject":"[PATCH 0/2] Typo fixes","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-07-28T20:45:37Z","receivedAt":"2020-07-28T20:45:45Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"Fix some simple typos: doubled words, and character swapping\n\nElijah Newren (2):\n Remove doubled words in various comments\n hashmap: fix typo in usage docs\n\n fsmonitor.c | 2 +-\n hashmap.h | 2 +-\n t/t5510-fetch.sh | 2 +-\n t/t6046-merge-skip-unneeded-updates.sh | 2 +-\n t/t8014-blame-ignore-fuzzy.sh | 2 +-\n wt-status.c | 2 +-\n 6 files changed, 6 insertions(+), 6 deletions(-)\n\n\nbase-commit: 47ae905ffb98cc4d4fd90083da6bc8dab55d9ecc\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-824%2Fnewren%2Ftypo-fixes-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-824/newren/typo-fixes-v1\nPull-Request: https://github.com/git/git/pull/824\n-- \ngitgitgadget\n"},{"id":"402246","messageId":"bbb8db27024298ed7264cee71e92376f62ac1073.1595969140.git.gitgitgadget@gmail.com","threadId":"53941","inReplyTo":"pull.824.git.git.1595969139.gitgitgadget@gmail.com","subject":"[PATCH 1/2] Remove doubled words in various comments","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-07-28T20:45:38Z","receivedAt":"2020-07-28T20:45:49Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nSigned-off-by: Elijah Newren \n---\n fsmonitor.c | 2 +-\n t/t5510-fetch.sh | 2 +-\n t/t6046-merge-skip-unneeded-updates.sh | 2 +-\n t/t8014-blame-ignore-fuzzy.sh | 2 +-\n wt-status.c | 2 +-\n 5 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/fsmonitor.c b/fsmonitor.c\nindex 932bd9012d..ed796e3e03 100644\n--- a/fsmonitor.c\n+++ b/fsmonitor.c\n@@ -217,7 +217,7 @@ void refresh_fsmonitor(struct index_state *istate)\n \t\t\t\t * Need to use a char * variable because static\n \t\t\t\t * analysis was suggesting to use strbuf_addbuf\n \t\t\t\t * but we don't want to copy the entire strbuf\n-\t\t\t\t * only the the chars up to the first NUL\n+\t\t\t\t * only the chars up to the first NUL\n \t\t\t\t */\n \t\t\t\tbuf = query_result.buf;\n \t\t\t\tstrbuf_addstr(&last_update_token, buf);\ndiff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh\nindex a66dbe0bde..7456c567cd 100755\n--- a/t/t5510-fetch.sh\n+++ b/t/t5510-fetch.sh\n@@ -797,7 +797,7 @@ test_configured_prune true true unset unset pruned pruned \\\n \t\"--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*\"\n \n # --prune-tags on its own does nothing, needs --prune as well, same\n-# for for fetch.pruneTags without fetch.prune\n+# for fetch.pruneTags without fetch.prune\n test_configured_prune unset unset unset unset kept kept \"--prune-tags\"\n test_configured_prune unset unset true unset kept kept \"\"\n test_configured_prune unset unset unset true kept kept \"\"\ndiff --git a/t/t6046-merge-skip-unneeded-updates.sh b/t/t6046-merge-skip-unneeded-updates.sh\nindex 1ddc9e6626..5a2d07e516 100755\n--- a/t/t6046-merge-skip-unneeded-updates.sh\n+++ b/t/t6046-merge-skip-unneeded-updates.sh\n@@ -661,7 +661,7 @@ test_setup_4a () {\n }\n \n # NOTE: For as long as we continue using unpack_trees() without index_only\n-# set to true, it will error out on a case like this claiming the the locally\n+# set to true, it will error out on a case like this claiming that the locally\n # modified file would be overwritten by the merge. Getting this testcase\n # correct requires doing the merge in-memory first, then realizing that no\n # updates to the file are necessary, and thus that we can just leave the path\ndiff --git a/t/t8014-blame-ignore-fuzzy.sh b/t/t8014-blame-ignore-fuzzy.sh\nindex 6e61882b6f..e68e6115a6 100755\n--- a/t/t8014-blame-ignore-fuzzy.sh\n+++ b/t/t8014-blame-ignore-fuzzy.sh\n@@ -248,7 +248,7 @@ Final\n EOF\n \n # The first line of b matches best with the last line of a, but the overall\n-# match is better if we match it with the the first line of a.\n+# match is better if we match it with the first line of a.\n title11=\"Piggy in the middle\"\n cat <a11\n abcdefg\ndiff --git a/wt-status.c b/wt-status.c\nindex c560cbe860..20f2075868 100644\n--- a/wt-status.c\n+++ b/wt-status.c\n@@ -2035,7 +2035,7 @@ static void wt_porcelain_print(struct wt_status *s)\n * [# branch.upstream \n * [# branch.ab + -]]\n *\n- * ::= the current commit hash or the the literal\n+ * ::= the current commit hash or the literal\n * \"(initial)\" to indicate an initialized repo\n * with no commits.\n *\n-- \ngitgitgadget\n\n"},{"id":"402245","messageId":"cd9e69a910eebfaa8fd7866326d60a5c9733f1c8.1595969140.git.gitgitgadget@gmail.com","threadId":"53941","inReplyTo":"pull.824.git.git.1595969139.gitgitgadget@gmail.com","subject":"[PATCH 2/2] hashmap: fix typo in usage docs","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-07-28T20:45:39Z","receivedAt":"2020-07-28T20:45:51Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nSigned-off-by: Elijah Newren \n---\n hashmap.h | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/hashmap.h b/hashmap.h\nindex 79ae9f80de..ef220de4c6 100644\n--- a/hashmap.h\n+++ b/hashmap.h\n@@ -168,7 +168,7 @@ struct hashmap_entry {\n * argument `keydata`, respectively. Otherwise, `keydata` is NULL.\n *\n * When it is too expensive to allocate a user entry (either because it is\n- * large or varialbe sized, such that it is not on the stack), then the\n+ * large or variable sized, such that it is not on the stack), then the\n * relevant data to check for equality should be passed via `keydata`.\n * In this case `key` can be a stripped down version of the user key data\n * or even just a hashmap_entry having the correct hash.\n-- \ngitgitgadget\n"},{"id":"402247","messageId":"20200728204804.GA94132@syl.lan","threadId":"53941","inReplyTo":"pull.824.git.git.1595969139.gitgitgadget@gmail.com","subject":"Re: [PATCH 0/2] Typo fixes","fromName":"Taylor Blau","fromEmail":"me@ttaylorr.com","sentAt":"2020-07-28T20:48:04Z","receivedAt":"2020-07-28T20:48:10Z","isPatch":true,"sender":{"key":"me@ttaylorr.com","avatar":"https://avatars.githubusercontent.com/u/301000140?v=4"},"body":"On Tue, Jul 28, 2020 at 08:45:37PM +0000, Elijah Newren via GitGitGadget wrote:\n> Fix some simple typos: doubled words, and character swapping\n\nFar be it from me--since I seem to always be making these mistakes\nmyself--to be an authoritative reviewer on this series, but it looks\nobviously good to me ;-).\n\n Reviewed-by: Taylor Blau \n\n> Elijah Newren (2):\n> Remove doubled words in various comments\n> hashmap: fix typo in usage docs\n>\n> fsmonitor.c | 2 +-\n> hashmap.h | 2 +-\n> t/t5510-fetch.sh | 2 +-\n> t/t6046-merge-skip-unneeded-updates.sh | 2 +-\n> t/t8014-blame-ignore-fuzzy.sh | 2 +-\n> wt-status.c | 2 +-\n> 6 files changed, 6 insertions(+), 6 deletions(-)\n>\n>\n> base-commit: 47ae905ffb98cc4d4fd90083da6bc8dab55d9ecc\n> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-824%2Fnewren%2Ftypo-fixes-v1\n> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-824/newren/typo-fixes-v1\n> Pull-Request: https://github.com/git/git/pull/824\n> --\n> gitgitgadget\n\nThanks,\nTaylor\n"},{"id":"402252","messageId":"xmqqft9bcote.fsf@gitster.c.googlers.com","threadId":"53941","inReplyTo":"20200728204804.GA94132@syl.lan","subject":"Re: [PATCH 0/2] Typo fixes","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-07-28T21:27:57Z","receivedAt":"2020-07-28T21:28:03Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Taylor Blau writes:\n\n> On Tue, Jul 28, 2020 at 08:45:37PM +0000, Elijah Newren via GitGitGadget wrote:\n>> Fix some simple typos: doubled words, and character swapping\n>\n> Far be it from me--since I seem to always be making these mistakes\n> myself--to be an authoritative reviewer on this series, but it looks\n> obviously good to me ;-).\n\nYeah, I am guilty of making many of these, but the fixes all looked\ngood.\n\nThanks.\n"}]}