{"thread":{"id":"43035","subject":"[PATCH] Spelling fixes","startedAt":"2016-08-09T08:53:51Z","lastAt":"2016-08-10T18:23:25Z","messageCount":6,"participants":["Ville Skyttä","Junio C Hamano","Johannes Sixt"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"293463","messageId":"1470732818-408-1-git-send-email-ville.skytta@iki.fi","threadId":"43035","inReplyTo":null,"subject":"[PATCH] Spelling fixes","fromName":"Ville Skyttä","fromEmail":"ville.skytta@iki.fi","sentAt":"2016-08-09T08:53:38Z","receivedAt":"2016-08-09T08:53:51Z","isPatch":true,"sender":{"key":"ville.skytta@iki.fi","avatar":"https://avatars.githubusercontent.com/u/109152?v=4"},"body":"Signed-off-by: Ville Skyttä \n---\n Documentation/RelNotes/2.3.10.txt | 2 +-\n Documentation/RelNotes/2.4.10.txt | 2 +-\n Documentation/RelNotes/2.5.4.txt | 2 +-\n Documentation/RelNotes/2.6.1.txt | 2 +-\n Documentation/git-remote-fd.txt | 2 +-\n Documentation/gitattributes.txt | 2 +-\n Documentation/gitmodules.txt | 2 +-\n contrib/hooks/multimail/README | 4 ++--\n contrib/mw-to-git/.perlcriticrc | 2 +-\n contrib/mw-to-git/git-remote-mediawiki.perl | 2 +-\n contrib/subtree/t/t7900-subtree.sh | 2 +-\n git-p4.py | 2 +-\n sha1_file.c | 2 +-\n t/README | 2 +-\n t/t1006-cat-file.sh | 2 +-\n t/t3101-ls-tree-dirname.sh | 2 +-\n t/t6018-rev-list-glob.sh | 2 +-\n t/t6030-bisect-porcelain.sh | 2 +-\n t/t7001-mv.sh | 8 ++++----\n t/t7810-grep.sh | 2 +-\n t/t9401-git-cvsserver-crlf.sh | 2 +-\n upload-pack.c | 2 +-\n 22 files changed, 26 insertions(+), 26 deletions(-)\n\ndiff --git a/Documentation/RelNotes/2.3.10.txt b/Documentation/RelNotes/2.3.10.txt\nindex 9d425d8..20c2d2c 100644\n--- a/Documentation/RelNotes/2.3.10.txt\n+++ b/Documentation/RelNotes/2.3.10.txt\n@@ -7,7 +7,7 @@ Fixes since v2.3.9\n * xdiff code we use to generate diffs is not prepared to handle\n extremely large files. It uses \"int\" in many places, which can\n overflow if we have a very large number of lines or even bytes in\n- our input files, for example. Cap the input size to soemwhere\n+ our input files, for example. Cap the input size to somewhere\n around 1GB for now.\n \n * Some protocols (like git-remote-ext) can execute arbitrary code\ndiff --git a/Documentation/RelNotes/2.4.10.txt b/Documentation/RelNotes/2.4.10.txt\nindex 8621199..702d8d4 100644\n--- a/Documentation/RelNotes/2.4.10.txt\n+++ b/Documentation/RelNotes/2.4.10.txt\n@@ -7,7 +7,7 @@ Fixes since v2.4.9\n * xdiff code we use to generate diffs is not prepared to handle\n extremely large files. It uses \"int\" in many places, which can\n overflow if we have a very large number of lines or even bytes in\n- our input files, for example. Cap the input size to soemwhere\n+ our input files, for example. Cap the input size to somewhere\n around 1GB for now.\n \n * Some protocols (like git-remote-ext) can execute arbitrary code\ndiff --git a/Documentation/RelNotes/2.5.4.txt b/Documentation/RelNotes/2.5.4.txt\nindex a5e8477..b8a2f93 100644\n--- a/Documentation/RelNotes/2.5.4.txt\n+++ b/Documentation/RelNotes/2.5.4.txt\n@@ -7,7 +7,7 @@ Fixes since v2.5.4\n * xdiff code we use to generate diffs is not prepared to handle\n extremely large files. It uses \"int\" in many places, which can\n overflow if we have a very large number of lines or even bytes in\n- our input files, for example. Cap the input size to soemwhere\n+ our input files, for example. Cap the input size to somewhere\n around 1GB for now.\n \n * Some protocols (like git-remote-ext) can execute arbitrary code\ndiff --git a/Documentation/RelNotes/2.6.1.txt b/Documentation/RelNotes/2.6.1.txt\nindex 1e51363..f37ea89 100644\n--- a/Documentation/RelNotes/2.6.1.txt\n+++ b/Documentation/RelNotes/2.6.1.txt\n@@ -7,7 +7,7 @@ Fixes since v2.6\n * xdiff code we use to generate diffs is not prepared to handle\n extremely large files. It uses \"int\" in many places, which can\n overflow if we have a very large number of lines or even bytes in\n- our input files, for example. Cap the input size to soemwhere\n+ our input files, for example. Cap the input size to somewhere\n around 1GB for now.\n \n * Some protocols (like git-remote-ext) can execute arbitrary code\ndiff --git a/Documentation/git-remote-fd.txt b/Documentation/git-remote-fd.txt\nindex e700baf..80afca8 100644\n--- a/Documentation/git-remote-fd.txt\n+++ b/Documentation/git-remote-fd.txt\n@@ -17,7 +17,7 @@ fetch, push or archive.\n \n If only is given, it is assumed to be a bidirectional socket connected\n to remote Git server (git-upload-pack, git-receive-pack or\n-git-upload-achive). If both and are given, they are assumed\n+git-upload-archive). If both and are given, they are assumed\n to be pipes connected to a remote Git server ( being the inbound pipe\n and being the outbound pipe.\n \ndiff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt\nindex 34db3e2..807577a 100644\n--- a/Documentation/gitattributes.txt\n+++ b/Documentation/gitattributes.txt\n@@ -133,7 +133,7 @@ Set to string value \"auto\"::\n \tWhen `text` is set to \"auto\", the path is marked for automatic\n \tend-of-line conversion. If Git decides that the content is\n \ttext, its line endings are converted to LF on checkin.\n-\tWhen the file has been commited with CRLF, no conversion is done.\n+\tWhen the file has been committed with CRLF, no conversion is done.\n \n Unspecified::\n \ndiff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt\nindex 0849d28..10dcc08 100644\n--- a/Documentation/gitmodules.txt\n+++ b/Documentation/gitmodules.txt\n@@ -81,7 +81,7 @@ submodule..ignore::\n \n submodule..shallow::\n \tWhen set to true, a clone of this submodule will be performed as a\n-\tshallow clone unless the user explicitely asks for a non-shallow\n+\tshallow clone unless the user explicitly asks for a non-shallow\n \tclone.\n \n \ndiff --git a/contrib/hooks/multimail/README b/contrib/hooks/multimail/README\nindex 0c91d19..22a23cd 100644\n--- a/contrib/hooks/multimail/README\n+++ b/contrib/hooks/multimail/README\n@@ -294,7 +294,7 @@ multimailhook.htmlInIntro, multimailhook.htmlInFooter\n like ``link``, the reader will see the HTML\n source code and not a proper link.\n \n- Set ``multimailhook.htmlInIntro`` to true to allow writting HTML\n+ Set ``multimailhook.htmlInIntro`` to true to allow writing HTML\n formatting in introduction templates. Similarly, set\n ``multimailhook.htmlInFooter`` for HTML in the footer.\n \n@@ -516,7 +516,7 @@ multimailhook.commitLogOpts\n \n multimailhook.dateSubstitute\n String to use as a substitute for ``Date:`` in the output of ``git\n- log`` while formatting commit messages. This is usefull to avoid\n+ log`` while formatting commit messages. This is useful to avoid\n emitting a line that can be interpreted by mailers as the start of\n a cited message (Zimbra webmail in particular). Defaults to\n ``CommitDate:``. Set to an empty string or ``none`` to deactivate\ndiff --git a/contrib/mw-to-git/.perlcriticrc b/contrib/mw-to-git/.perlcriticrc\nindex 5a9955d..158958d 100644\n--- a/contrib/mw-to-git/.perlcriticrc\n+++ b/contrib/mw-to-git/.perlcriticrc\n@@ -19,7 +19,7 @@\n [InputOutput::RequireCheckedSyscalls]\n functions = open say close\n \n-# This rules demands to add a dependancy for the Readonly module. This is not\n+# This rule demands to add a dependency for the Readonly module. This is not\n # wished.\n [-ValuesAndExpressions::ProhibitConstantPragma]\n \ndiff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl\nindex 8dd74a9..41e74fb 100755\n--- a/contrib/mw-to-git/git-remote-mediawiki.perl\n+++ b/contrib/mw-to-git/git-remote-mediawiki.perl\n@@ -963,7 +963,7 @@ sub mw_upload_file {\n \t\tprint {*STDERR} \"Check the configuration of file uploads in your mediawiki.\\n\";\n \t\treturn $newrevid;\n \t}\n-\t# Deleting and uploading a file requires a priviledged user\n+\t# Deleting and uploading a file requires a privileged user\n \tif ($file_deleted) {\n \t\t$mediawiki = connect_maybe($mediawiki, $remotename, $url);\n \t\tmy $query = {\ndiff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh\nindex 9751cfe..3c87eba 100755\n--- a/contrib/subtree/t/t7900-subtree.sh\n+++ b/contrib/subtree/t/t7900-subtree.sh\n@@ -948,7 +948,7 @@ test_expect_success 'split a new subtree without --onto option' '\n \n \t\t# also test that we still can split out an entirely new subtree\n \t\t# if the parent of the first commit in the tree is not empty,\n-\t\t# then the new subtree has accidently been attached to something\n+\t\t# then the new subtree has accidentally been attached to something\n \t\tgit subtree split --prefix=\"sub dir2\" --branch subproj2-br &&\n \t\tcheck_equal \"$(git log --pretty=format:%P -1 subproj2-br)\" \"\"\n \t)\ndiff --git a/git-p4.py b/git-p4.py\nindex ac6f4c1..fd5ca52 100755\n--- a/git-p4.py\n+++ b/git-p4.py\n@@ -1934,7 +1934,7 @@ class P4Submit(Command, P4UserMap):\n if self.useClientSpec:\n self.clientSpecDirs = getClientSpec()\n \n- # Check for the existance of P4 branches\n+ # Check for the existence of P4 branches\n branchesDetected = (len(p4BranchesInGit().keys()) > 1)\n \n if self.useClientSpec and not branchesDetected:\ndiff --git a/sha1_file.c b/sha1_file.c\nindex 3066b5f..7026e4b 100644\n--- a/sha1_file.c\n+++ b/sha1_file.c\n@@ -1692,7 +1692,7 @@ static int parse_sha1_header_extended(const char *hdr, struct object_info *oi,\n \t\tstrbuf_add(oi->typename, type_buf, type_len);\n \t/*\n \t * Set type to 0 if its an unknown object and\n-\t * we're obtaining the type using '--allow-unkown-type'\n+\t * we're obtaining the type using '--allow-unknown-type'\n \t * option.\n \t */\n \tif ((flags & LOOKUP_UNKNOWN_OBJECT) && (type < 0))\ndiff --git a/t/README b/t/README\nindex 76a0daa..0f764c0 100644\n--- a/t/README\n+++ b/t/README\n@@ -265,7 +265,7 @@ right, so this:\n $ sh ./t9200-git-cvsexport-commit.sh --run='1-4 !3'\n \n will run tests 1, 2, and 4. Items that comes later have higher\n-precendence. It means that this:\n+precedence. It means that this:\n \n $ sh ./t9200-git-cvsexport-commit.sh --run='!3 1-4'\n \ndiff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh\nindex 4f38078..b19f332 100755\n--- a/t/t1006-cat-file.sh\n+++ b/t/t1006-cat-file.sh\n@@ -231,7 +231,7 @@ $tag_content\n | git cat-file --batch)\"\n '\n \n-test_expect_success \"--batch-check for an emtpy line\" '\n+test_expect_success \"--batch-check for an empty line\" '\n test \" missing\" = \"$(echo | git cat-file --batch-check)\"\n '\n \ndiff --git a/t/t3101-ls-tree-dirname.sh b/t/t3101-ls-tree-dirname.sh\nindex 425d858..327ded4 100755\n--- a/t/t3101-ls-tree-dirname.sh\n+++ b/t/t3101-ls-tree-dirname.sh\n@@ -16,7 +16,7 @@ This test runs git ls-tree with the following in a tree.\n path3/1.txt - a file in a directory\n path3/2.txt - a file in a directory\n \n-Test the handling of mulitple directories which have matching file\n+Test the handling of multiple directories which have matching file\n entries. Also test odd filename and missing entries handling.\n '\n . ./test-lib.sh\ndiff --git a/t/t6018-rev-list-glob.sh b/t/t6018-rev-list-glob.sh\nindex d00f7db..381f35e 100755\n--- a/t/t6018-rev-list-glob.sh\n+++ b/t/t6018-rev-list-glob.sh\n@@ -257,7 +257,7 @@ test_expect_success 'rev-list accumulates multiple --exclude' '\n \n \n # \"git rev-list\" is likely to be a bug in the calling script and may\n-# deserve an error message, but do cases where set of refs programatically\n+# deserve an error message, but do cases where set of refs programmatically\n # given using globbing and/or --stdin need to fail with the same error, or\n # are we better off reporting a success with no output? The following few\n # tests document the current behaviour to remind us that we might want to\ndiff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh\nindex 86d1380..5e5370f 100755\n--- a/t/t6030-bisect-porcelain.sh\n+++ b/t/t6030-bisect-porcelain.sh\n@@ -721,7 +721,7 @@ git bisect good 3de952f2416b6084f557ec417709eac740c6818c\n # first bad commit: [32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into .\n EOF\n \n-test_expect_success 'bisect log: successfull result' '\n+test_expect_success 'bisect log: successful result' '\n \tgit bisect reset &&\n \tgit bisect start $HASH4 $HASH2 &&\n \tgit bisect good &&\ndiff --git a/t/t7001-mv.sh b/t/t7001-mv.sh\nindex 4a2570e..e365d1f 100755\n--- a/t/t7001-mv.sh\n+++ b/t/t7001-mv.sh\n@@ -292,8 +292,8 @@ test_expect_success 'setup submodule' '\n \techo content >file &&\n \tgit add file &&\n \tgit commit -m \"added sub and file\" &&\n-\tmkdir -p deep/directory/hierachy &&\n-\tgit submodule add ./. deep/directory/hierachy/sub &&\n+\tmkdir -p deep/directory/hierarchy &&\n+\tgit submodule add ./. deep/directory/hierarchy/sub &&\n \tgit commit -m \"added another submodule\" &&\n \tgit branch submodule\n '\n@@ -485,8 +485,8 @@ test_expect_success 'moving a submodule in nested directories' '\n \t\t# git status would fail if the update of linking git dir to\n \t\t# work dir of the submodule failed.\n \t\tgit status &&\n-\t\tgit config -f ../.gitmodules submodule.deep/directory/hierachy/sub.path >../actual &&\n-\t\techo \"directory/hierachy/sub\" >../expect\n+\t\tgit config -f ../.gitmodules submodule.deep/directory/hierarchy/sub.path >../actual &&\n+\t\techo \"directory/hierarchy/sub\" >../expect\n \t) &&\n \ttest_cmp actual expect\n '\ndiff --git a/t/t7810-grep.sh b/t/t7810-grep.sh\nindex cf3f9ec..de2405c 100755\n--- a/t/t7810-grep.sh\n+++ b/t/t7810-grep.sh\n@@ -581,7 +581,7 @@ test_expect_success 'log grep (9)' '\n '\n \n test_expect_success 'log grep (9)' '\n-\tgit log -g --grep-reflog=\"commit: third\" --author=\"non-existant\" --pretty=tformat:%s >actual &&\n+\tgit log -g --grep-reflog=\"commit: third\" --author=\"non-existent\" --pretty=tformat:%s >actual &&\n \t: >expect &&\n \ttest_cmp expect actual\n '\ndiff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh\nindex f324b9f..84787ee 100755\n--- a/t/t9401-git-cvsserver-crlf.sh\n+++ b/t/t9401-git-cvsserver-crlf.sh\n@@ -154,7 +154,7 @@ test_expect_success 'adding files' '\n echo \"more text\" > src.c &&\n GIT_CONFIG=\"$git_config\" cvs -Q add src.c >cvs.log 2>&1 &&\n marked_as . src.c \"\" &&\n- echo \"psuedo-binary\" > temp.bin\n+ echo \"pseudo-binary\" > temp.bin\n ) &&\n GIT_CONFIG=\"$git_config\" cvs -Q add subdir/temp.bin >cvs.log 2>&1 &&\n marked_as subdir temp.bin \"-kb\" &&\ndiff --git a/upload-pack.c b/upload-pack.c\nindex d4cc414..ca7f941 100644\n--- a/upload-pack.c\n+++ b/upload-pack.c\n@@ -836,7 +836,7 @@ int cmd_main(int argc, const char **argv)\n \t\tOPT_BOOL(0, \"stateless-rpc\", &stateless_rpc,\n \t\t\t N_(\"quit after a single request/response exchange\")),\n \t\tOPT_BOOL(0, \"advertise-refs\", &advertise_refs,\n-\t\t\t N_(\"exit immediately after intial ref advertisement\")),\n+\t\t\t N_(\"exit immediately after initial ref advertisement\")),\n \t\tOPT_BOOL(0, \"strict\", &strict,\n \t\t\t N_(\"do not try /.git/ if is no Git directory\")),\n \t\tOPT_INTEGER(0, \"timeout\", &timeout,\n-- \n2.5.5\n\n"},{"id":"293515","messageId":"xmqqpophajqa.fsf@gitster.mtv.corp.google.com","threadId":"43035","inReplyTo":"1470732818-408-1-git-send-email-ville.skytta@iki.fi","subject":"Re: [PATCH] Spelling fixes","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-08-09T18:19:09Z","receivedAt":"2016-08-09T18:19:18Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ville Skyttä writes:\n\n> Signed-off-by: Ville Skyttä \n> ---\n> Documentation/RelNotes/2.3.10.txt | 2 +-\n> Documentation/RelNotes/2.4.10.txt | 2 +-\n> Documentation/RelNotes/2.5.4.txt | 2 +-\n> Documentation/RelNotes/2.6.1.txt | 2 +-\n> Documentation/git-remote-fd.txt | 2 +-\n> Documentation/gitattributes.txt | 2 +-\n> Documentation/gitmodules.txt | 2 +-\n> contrib/hooks/multimail/README | 4 ++--\n> contrib/mw-to-git/.perlcriticrc | 2 +-\n> contrib/mw-to-git/git-remote-mediawiki.perl | 2 +-\n> contrib/subtree/t/t7900-subtree.sh | 2 +-\n> git-p4.py | 2 +-\n> sha1_file.c | 2 +-\n> t/README | 2 +-\n> t/t1006-cat-file.sh | 2 +-\n> t/t3101-ls-tree-dirname.sh | 2 +-\n> t/t6018-rev-list-glob.sh | 2 +-\n> t/t6030-bisect-porcelain.sh | 2 +-\n> t/t7001-mv.sh | 8 ++++----\n> t/t7810-grep.sh | 2 +-\n> t/t9401-git-cvsserver-crlf.sh | 2 +-\n> upload-pack.c | 2 +-\n> 22 files changed, 26 insertions(+), 26 deletions(-)\n\nWow, that's a lot of typos. I asked \"git show --word-diff\" what got\nchanged, which told me this:\n\n \n\n accidently accidentally\n commited committed\n dependancy dependency\n emtpy empty\n existance existence\n explicitely explicitly\n git-upload-achive git-upload-archive\n hierachy hierarchy\n intial initial\n mulitple multiple\n non-existant non-existent\n precendence. precedence.\n priviledged privileged\n programatically programmatically\n psuedo-binary pseudo-binary\n soemwhere somewhere\n successfull successful\n unkown unknown\n usefull useful\n writting writing\n\nand then looked at all lines in the patch. They all looked\nreasonable.\n\nThere are two \"commited\" you seem to have missed, though,\n\nt/t3420-rebase-autostash.sh: echo uncommited-content >file0 &&\nt/t3420-rebase-autostash.sh: echo uncommited-content >expected &&\n\nwhich I'll queue on top of this patch to be later squashed (i.e. no\nneed to resend the whole thing only to add these two).\n\nThanks.\n"},{"id":"293524","messageId":"CABr9L5DX9uHVkNMY4ihLcQtVoOLVXJh-EDA0iiOD9ffPkJSO-g@mail.gmail.com","threadId":"43035","inReplyTo":"xmqqpophajqa.fsf@gitster.mtv.corp.google.com","subject":"Re: [PATCH] Spelling fixes","fromName":"Ville Skyttä","fromEmail":"ville.skytta@iki.fi","sentAt":"2016-08-09T18:41:56Z","receivedAt":"2016-08-09T18:42:51Z","isPatch":true,"sender":{"key":"ville.skytta@iki.fi","avatar":"https://avatars.githubusercontent.com/u/109152?v=4"},"body":"On Tue, Aug 9, 2016 at 9:19 PM, Junio C Hamano wrote:\n[...]\n> There are two \"commited\" you seem to have missed, though,\n>\n> t/t3420-rebase-autostash.sh: echo uncommited-content >file0 &&\n> t/t3420-rebase-autostash.sh: echo uncommited-content >expected &&\n>\n> which I'll queue on top of this patch to be later squashed (i.e. no\n> need to resend the whole thing only to add these two).\n\nThanks. https://github.com/client9/misspell/pull/61 :)\n\nAlso, there's SSTATE_TRANSFERING->SSTATE_TRANSFERRING in\ntransport-helper.c, maybe you can squash that one in as well if you\nthink it's fine?\n"},{"id":"293566","messageId":"xmqq7fbo7ecl.fsf@gitster.mtv.corp.google.com","threadId":"43035","inReplyTo":"f4f313a0-749d-4db2-3afc-9e93ea2ba130@kdbg.org","subject":"Re: [PATCH] Spelling fixes","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-08-10T16:55:54Z","receivedAt":"2016-08-10T18:15:38Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Sixt writes:\n\n> Am 09.08.2016 um 20:19 schrieb Junio C Hamano:\n>> \n>> \n>> accidently accidentally\n>> commited committed\n>> dependancy dependency\n>> emtpy empty\n>> existance existence\n>> explicitely explicitly\n>> git-upload-achive git-upload-archive\n>> hierachy hierarchy\n>> intial initial\n>> mulitple multiple\n>> non-existant non-existent\n>> precendence. precedence.\n>> priviledged privileged\n>> programatically programmatically\n>> psuedo-binary pseudo-binary\n>> soemwhere somewhere\n>> successfull successful\n>> unkown unknown\n>> usefull useful\n>> writting writing\n>\n> This reminds me of one occurrence of \"indegee\" in commit-slab.h that\n> should be \"indegree\". The word is not in this list above, so I don't\n> know whether you would like to have it fixed in the same patch or not...\n>\n> (BTW, is that word \"in-degree\" or \"ingredient\"?)\n\nIIRC it is the former, to count \"how many incoming arcs does this\nnode have?\"\n\nWill queue to squash in. Thanks.\n\n> -- Hannes\n>\n> diff --git a/commit-slab.h b/commit-slab.h\n> --- a/commit-slab.h\n> +++ b/commit-slab.h\n> @@ -8,7 +8,7 @@\n> *\n> * After including this header file, using:\n> *\n> - * define_commit_slab(indegee, int);\n> + * define_commit_slab(indegree, int);\n> *\n> * will let you call the following functions:\n> *\n"},{"id":"293567","messageId":"xmqq37mc7e6k.fsf@gitster.mtv.corp.google.com","threadId":"43035","inReplyTo":"CABr9L5DX9uHVkNMY4ihLcQtVoOLVXJh-EDA0iiOD9ffPkJSO-g@mail.gmail.com","subject":"Re: [PATCH] Spelling fixes","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-08-10T16:59:31Z","receivedAt":"2016-08-10T18:15:48Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ville Skyttä writes:\n\n> On Tue, Aug 9, 2016 at 9:19 PM, Junio C Hamano wrote:\n> [...]\n>> There are two \"commited\" you seem to have missed, though,\n>>\n>> t/t3420-rebase-autostash.sh: echo uncommited-content >file0 &&\n>> t/t3420-rebase-autostash.sh: echo uncommited-content >expected &&\n>>\n>> which I'll queue on top of this patch to be later squashed (i.e. no\n>> need to resend the whole thing only to add these two).\n>\n> Thanks. https://github.com/client9/misspell/pull/61 :)\n>\n> Also, there's SSTATE_TRANSFERING->SSTATE_TRANSFERRING in\n> transport-helper.c, maybe you can squash that one in as well if you\n> think it's fine?\n\nOne comment that refers to that token spells it correctly, which is\nfunny ;-)\n\nHere is a squashable change I've collected so far.\n\nSubject: [PATCH] SQUASH???\n\n \n indegee indegree\n transfering transferring\n uncommited uncommitted\n---\n commit-slab.h | 2 +-\n t/t3420-rebase-autostash.sh | 4 ++--\n transport-helper.c | 8 ++++----\n 3 files changed, 7 insertions(+), 7 deletions(-)\n\ndiff --git a/commit-slab.h b/commit-slab.h\nindex f84b449..be16da7 100644\n--- a/commit-slab.h\n+++ b/commit-slab.h\n@@ -8,7 +8,7 @@\n *\n * After including this header file, using:\n *\n- * define_commit_slab(indegee, int);\n+ * define_commit_slab(indegree, int);\n *\n * will let you call the following functions:\n *\ndiff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh\nindex 532ff5c..ab8a63e 100755\n--- a/t/t3420-rebase-autostash.sh\n+++ b/t/t3420-rebase-autostash.sh\n@@ -179,7 +179,7 @@ testrebase \" --interactive\" .git/rebase-merge\n \n test_expect_success 'abort rebase -i with --autostash' '\n \ttest_when_finished \"git reset --hard\" &&\n-\techo uncommited-content >file0 &&\n+\techo uncommitted-content >file0 &&\n \t(\n \t\twrite_script abort-editor.sh <<-\\EOF &&\n \t\t\techo >\"$1\"\n@@ -188,7 +188,7 @@ test_expect_success 'abort rebase -i with --autostash' '\n \t\ttest_must_fail git rebase -i --autostash HEAD^ &&\n \t\trm -f abort-editor.sh\n \t) &&\n-\techo uncommited-content >expected &&\n+\techo uncommitted-content >expected &&\n \ttest_cmp expected file0\n '\n \ndiff --git a/transport-helper.c b/transport-helper.c\nindex 4208743..db2f930 100644\n--- a/transport-helper.c\n+++ b/transport-helper.c\n@@ -1103,7 +1103,7 @@ static void transfer_debug(const char *fmt, ...)\n }\n \n /* Stream state: More data may be coming in this direction. */\n-#define SSTATE_TRANSFERING 0\n+#define SSTATE_TRANSFERRING 0\n /*\n * Stream state: No more data coming in this direction, flushing rest of\n * data.\n@@ -1112,7 +1112,7 @@ static void transfer_debug(const char *fmt, ...)\n /* Stream state: Transfer in this direction finished. */\n #define SSTATE_FINISHED 2\n \n-#define STATE_NEEDS_READING(state) ((state) <= SSTATE_TRANSFERING)\n+#define STATE_NEEDS_READING(state) ((state) <= SSTATE_TRANSFERRING)\n #define STATE_NEEDS_WRITING(state) ((state) <= SSTATE_FLUSHING)\n #define STATE_NEEDS_CLOSING(state) ((state) == SSTATE_FLUSHING)\n \n@@ -1369,7 +1369,7 @@ int bidirectional_transfer_loop(int input, int output)\n \tstate.ptg.dest = 1;\n \tstate.ptg.src_is_sock = (input == output);\n \tstate.ptg.dest_is_sock = 0;\n-\tstate.ptg.state = SSTATE_TRANSFERING;\n+\tstate.ptg.state = SSTATE_TRANSFERRING;\n \tstate.ptg.bufuse = 0;\n \tstate.ptg.src_name = \"remote input\";\n \tstate.ptg.dest_name = \"stdout\";\n@@ -1378,7 +1378,7 @@ int bidirectional_transfer_loop(int input, int output)\n \tstate.gtp.dest = output;\n \tstate.gtp.src_is_sock = 0;\n \tstate.gtp.dest_is_sock = (input == output);\n-\tstate.gtp.state = SSTATE_TRANSFERING;\n+\tstate.gtp.state = SSTATE_TRANSFERRING;\n \tstate.gtp.bufuse = 0;\n \tstate.gtp.src_name = \"stdin\";\n \tstate.gtp.dest_name = \"remote output\";\n-- \n2.9.2-831-g532adb1\n\n\n\n"},{"id":"293572","messageId":"f4f313a0-749d-4db2-3afc-9e93ea2ba130@kdbg.org","threadId":"43035","inReplyTo":"xmqqpophajqa.fsf@gitster.mtv.corp.google.com","subject":"Re: [PATCH] Spelling fixes","fromName":"Johannes Sixt","fromEmail":"j6t@kdbg.org","sentAt":"2016-08-10T13:26:54Z","receivedAt":"2016-08-10T18:23:25Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Am 09.08.2016 um 20:19 schrieb Junio C Hamano:\n> \n> \n> accidently accidentally\n> commited committed\n> dependancy dependency\n> emtpy empty\n> existance existence\n> explicitely explicitly\n> git-upload-achive git-upload-archive\n> hierachy hierarchy\n> intial initial\n> mulitple multiple\n> non-existant non-existent\n> precendence. precedence.\n> priviledged privileged\n> programatically programmatically\n> psuedo-binary pseudo-binary\n> soemwhere somewhere\n> successfull successful\n> unkown unknown\n> usefull useful\n> writting writing\n\nThis reminds me of one occurrence of \"indegee\" in commit-slab.h that\nshould be \"indegree\". The word is not in this list above, so I don't\nknow whether you would like to have it fixed in the same patch or not...\n\n(BTW, is that word \"in-degree\" or \"ingredient\"?)\n\n-- Hannes\n\ndiff --git a/commit-slab.h b/commit-slab.h\n--- a/commit-slab.h\n+++ b/commit-slab.h\n@@ -8,7 +8,7 @@\n *\n * After including this header file, using:\n *\n- * define_commit_slab(indegee, int);\n+ * define_commit_slab(indegree, int);\n *\n * will let you call the following functions:\n *\n\n"}]}