threads / patch / 43035

patchSpelling fixes

Subject: [PATCH] Spelling fixes

## tl;dr

6 messages between Aug 9, 2016 and Aug 10, 2016. Diffs are folded; open one to read it.

replies: 5people: 3as markdown or json

Ville Skyttä· Aug 9, 2016, 08:53 UTC · lore
Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>
---
 Documentation/RelNotes/2.3.10.txt           | 2 +-
 Documentation/RelNotes/2.4.10.txt           | 2 +-
 Documentation/RelNotes/2.5.4.txt            | 2 +-
 Documentation/RelNotes/2.6.1.txt            | 2 +-
 Documentation/git-remote-fd.txt             | 2 +-
 Documentation/gitattributes.txt             | 2 +-
 Documentation/gitmodules.txt                | 2 +-
 contrib/hooks/multimail/README              | 4 ++--
 contrib/mw-to-git/.perlcriticrc             | 2 +-
 contrib/mw-to-git/git-remote-mediawiki.perl | 2 +-
 contrib/subtree/t/t7900-subtree.sh          | 2 +-
 git-p4.py                                   | 2 +-
 sha1_file.c                                 | 2 +-
 t/README                                    | 2 +-
 t/t1006-cat-file.sh                         | 2 +-
 t/t3101-ls-tree-dirname.sh                  | 2 +-
 t/t6018-rev-list-glob.sh                    | 2 +-
 t/t6030-bisect-porcelain.sh                 | 2 +-
 t/t7001-mv.sh                               | 8 ++++----
 t/t7810-grep.sh                             | 2 +-
 t/t9401-git-cvsserver-crlf.sh               | 2 +-
 upload-pack.c                               | 2 +-
 22 files changed, 26 insertions(+), 26 deletions(-)
Show changes to 22 files +26 −26

Documentation/RelNotes/2.3.10.txt, Documentation/RelNotes/2.4.10.txt, Documentation/RelNotes/2.5.4.txt, Documentation/RelNotes/2.6.1.txt, Documentation/git-remote-fd.txt, Documentation/gitattributes.txt, Documentation/gitmodules.txt, contrib/hooks/multimail/README, contrib/mw-to-git/.perlcriticrc, contrib/mw-to-git/git-remote-mediawiki.perl, contrib/subtree/t/t7900-subtree.sh, git-p4.py, sha1_file.c, t/README, t/t1006-cat-file.sh, t/t3101-ls-tree-dirname.sh, t/t6018-rev-list-glob.sh, t/t6030-bisect-porcelain.sh, t/t7001-mv.sh, t/t7810-grep.sh, t/t9401-git-cvsserver-crlf.sh, upload-pack.c

diff --git a/Documentation/RelNotes/2.3.10.txt b/Documentation/RelNotes/2.3.10.txt
index 9d425d8..20c2d2c 100644
--- a/Documentation/RelNotes/2.3.10.txt
+++ b/Documentation/RelNotes/2.3.10.txt
@@ -7,7 +7,7 @@ Fixes since v2.3.9
  * xdiff code we use to generate diffs is not prepared to handle
    extremely large files.  It uses "int" in many places, which can
    overflow if we have a very large number of lines or even bytes in
-   our input files, for example.  Cap the input size to soemwhere
+   our input files, for example.  Cap the input size to somewhere
    around 1GB for now.
 
  * Some protocols (like git-remote-ext) can execute arbitrary code
diff --git a/Documentation/RelNotes/2.4.10.txt b/Documentation/RelNotes/2.4.10.txt
index 8621199..702d8d4 100644
--- a/Documentation/RelNotes/2.4.10.txt
+++ b/Documentation/RelNotes/2.4.10.txt
@@ -7,7 +7,7 @@ Fixes since v2.4.9
  * xdiff code we use to generate diffs is not prepared to handle
    extremely large files.  It uses "int" in many places, which can
    overflow if we have a very large number of lines or even bytes in
-   our input files, for example.  Cap the input size to soemwhere
+   our input files, for example.  Cap the input size to somewhere
    around 1GB for now.
 
  * Some protocols (like git-remote-ext) can execute arbitrary code
diff --git a/Documentation/RelNotes/2.5.4.txt b/Documentation/RelNotes/2.5.4.txt
index a5e8477..b8a2f93 100644
--- a/Documentation/RelNotes/2.5.4.txt
+++ b/Documentation/RelNotes/2.5.4.txt
@@ -7,7 +7,7 @@ Fixes since v2.5.4
  * xdiff code we use to generate diffs is not prepared to handle
    extremely large files.  It uses "int" in many places, which can
    overflow if we have a very large number of lines or even bytes in
-   our input files, for example.  Cap the input size to soemwhere
+   our input files, for example.  Cap the input size to somewhere
    around 1GB for now.
 
  * Some protocols (like git-remote-ext) can execute arbitrary code
diff --git a/Documentation/RelNotes/2.6.1.txt b/Documentation/RelNotes/2.6.1.txt
index 1e51363..f37ea89 100644
--- a/Documentation/RelNotes/2.6.1.txt
+++ b/Documentation/RelNotes/2.6.1.txt
@@ -7,7 +7,7 @@ Fixes since v2.6
  * xdiff code we use to generate diffs is not prepared to handle
    extremely large files.  It uses "int" in many places, which can
    overflow if we have a very large number of lines or even bytes in
-   our input files, for example.  Cap the input size to soemwhere
+   our input files, for example.  Cap the input size to somewhere
    around 1GB for now.
 
  * Some protocols (like git-remote-ext) can execute arbitrary code
diff --git a/Documentation/git-remote-fd.txt b/Documentation/git-remote-fd.txt
index e700baf..80afca8 100644
--- a/Documentation/git-remote-fd.txt
+++ b/Documentation/git-remote-fd.txt
@@ -17,7 +17,7 @@ fetch, push or archive.
 
 If only <infd> is given, it is assumed to be a bidirectional socket connected
 to remote Git server (git-upload-pack, git-receive-pack or
-git-upload-achive). If both <infd> and <outfd> are given, they are assumed
+git-upload-archive). If both <infd> and <outfd> are given, they are assumed
 to be pipes connected to a remote Git server (<infd> being the inbound pipe
 and <outfd> being the outbound pipe.
 
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 34db3e2..807577a 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -133,7 +133,7 @@ Set to string value "auto"::
 	When `text` is set to "auto", the path is marked for automatic
 	end-of-line conversion.  If Git decides that the content is
 	text, its line endings are converted to LF on checkin.
-	When the file has been commited with CRLF, no conversion is done.
+	When the file has been committed with CRLF, no conversion is done.
 
 Unspecified::
 
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 0849d28..10dcc08 100644
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -81,7 +81,7 @@ submodule.<name>.ignore::
 
 submodule.<name>.shallow::
 	When set to true, a clone of this submodule will be performed as a
-	shallow clone unless the user explicitely asks for a non-shallow
+	shallow clone unless the user explicitly asks for a non-shallow
 	clone.
 
 
diff --git a/contrib/hooks/multimail/README b/contrib/hooks/multimail/README
index 0c91d19..22a23cd 100644
--- a/contrib/hooks/multimail/README
+++ b/contrib/hooks/multimail/README
@@ -294,7 +294,7 @@ multimailhook.htmlInIntro, multimailhook.htmlInFooter
     like ``<a href="foo">link</a>``, the reader will see the HTML
     source code and not a proper link.
 
-    Set ``multimailhook.htmlInIntro`` to true to allow writting HTML
+    Set ``multimailhook.htmlInIntro`` to true to allow writing HTML
     formatting in introduction templates. Similarly, set
     ``multimailhook.htmlInFooter`` for HTML in the footer.
 
@@ -516,7 +516,7 @@ multimailhook.commitLogOpts
 
 multimailhook.dateSubstitute
     String to use as a substitute for ``Date:`` in the output of ``git
-    log`` while formatting commit messages. This is usefull to avoid
+    log`` while formatting commit messages. This is useful to avoid
     emitting a line that can be interpreted by mailers as the start of
     a cited message (Zimbra webmail in particular). Defaults to
     ``CommitDate:``. Set to an empty string or ``none`` to deactivate
diff --git a/contrib/mw-to-git/.perlcriticrc b/contrib/mw-to-git/.perlcriticrc
index 5a9955d..158958d 100644
--- a/contrib/mw-to-git/.perlcriticrc
+++ b/contrib/mw-to-git/.perlcriticrc
@@ -19,7 +19,7 @@
 [InputOutput::RequireCheckedSyscalls]
 functions = open say close
 
-# This rules demands to add a dependancy for the Readonly module. This is not
+# This rule demands to add a dependency for the Readonly module. This is not
 # wished.
 [-ValuesAndExpressions::ProhibitConstantPragma]
 
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
index 8dd74a9..41e74fb 100755
--- a/contrib/mw-to-git/git-remote-mediawiki.perl
+++ b/contrib/mw-to-git/git-remote-mediawiki.perl
@@ -963,7 +963,7 @@ sub mw_upload_file {
 		print {*STDERR} "Check the configuration of file uploads in your mediawiki.\n";
 		return $newrevid;
 	}
-	# Deleting and uploading a file requires a priviledged user
+	# Deleting and uploading a file requires a privileged user
 	if ($file_deleted) {
 		$mediawiki = connect_maybe($mediawiki, $remotename, $url);
 		my $query = {
diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index 9751cfe..3c87eba 100755
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@ -948,7 +948,7 @@ test_expect_success 'split a new subtree without --onto option' '
 
 		# also test that we still can split out an entirely new subtree
 		# if the parent of the first commit in the tree is not empty,
-		# then the new subtree has accidently been attached to something
+		# then the new subtree has accidentally been attached to something
 		git subtree split --prefix="sub dir2" --branch subproj2-br &&
 		check_equal "$(git log --pretty=format:%P -1 subproj2-br)" ""
 	)
diff --git a/git-p4.py b/git-p4.py
index ac6f4c1..fd5ca52 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1934,7 +1934,7 @@ class P4Submit(Command, P4UserMap):
         if self.useClientSpec:
             self.clientSpecDirs = getClientSpec()
 
-        # Check for the existance of P4 branches
+        # Check for the existence of P4 branches
         branchesDetected = (len(p4BranchesInGit().keys()) > 1)
 
         if self.useClientSpec and not branchesDetected:
diff --git a/sha1_file.c b/sha1_file.c
index 3066b5f..7026e4b 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1692,7 +1692,7 @@ static int parse_sha1_header_extended(const char *hdr, struct object_info *oi,
 		strbuf_add(oi->typename, type_buf, type_len);
 	/*
 	 * Set type to 0 if its an unknown object and
-	 * we're obtaining the type using '--allow-unkown-type'
+	 * we're obtaining the type using '--allow-unknown-type'
 	 * option.
 	 */
 	if ((flags & LOOKUP_UNKNOWN_OBJECT) && (type < 0))
diff --git a/t/README b/t/README
index 76a0daa..0f764c0 100644
--- a/t/README
+++ b/t/README
@@ -265,7 +265,7 @@ right, so this:
     $ sh ./t9200-git-cvsexport-commit.sh --run='1-4 !3'
 
 will run tests 1, 2, and 4.  Items that comes later have higher
-precendence.  It means that this:
+precedence.  It means that this:
 
     $ sh ./t9200-git-cvsexport-commit.sh --run='!3 1-4'
 
diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh
index 4f38078..b19f332 100755
--- a/t/t1006-cat-file.sh
+++ b/t/t1006-cat-file.sh
@@ -231,7 +231,7 @@ $tag_content
        | git cat-file --batch)"
 '
 
-test_expect_success "--batch-check for an emtpy line" '
+test_expect_success "--batch-check for an empty line" '
     test " missing" = "$(echo | git cat-file --batch-check)"
 '
 
diff --git a/t/t3101-ls-tree-dirname.sh b/t/t3101-ls-tree-dirname.sh
index 425d858..327ded4 100755
--- a/t/t3101-ls-tree-dirname.sh
+++ b/t/t3101-ls-tree-dirname.sh
@@ -16,7 +16,7 @@ This test runs git ls-tree with the following in a tree.
     path3/1.txt        - a file in a directory
     path3/2.txt        - a file in a directory
 
-Test the handling of mulitple directories which have matching file
+Test the handling of multiple directories which have matching file
 entries.  Also test odd filename and missing entries handling.
 '
 . ./test-lib.sh
diff --git a/t/t6018-rev-list-glob.sh b/t/t6018-rev-list-glob.sh
index d00f7db..381f35e 100755
--- a/t/t6018-rev-list-glob.sh
+++ b/t/t6018-rev-list-glob.sh
@@ -257,7 +257,7 @@ test_expect_success 'rev-list accumulates multiple --exclude' '
 
 
 # "git rev-list<ENTER>" is likely to be a bug in the calling script and may
-# deserve an error message, but do cases where set of refs programatically
+# deserve an error message, but do cases where set of refs programmatically
 # given using globbing and/or --stdin need to fail with the same error, or
 # are we better off reporting a success with no output?  The following few
 # tests document the current behaviour to remind us that we might want to
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 86d1380..5e5370f 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -721,7 +721,7 @@ git bisect good 3de952f2416b6084f557ec417709eac740c6818c
 # first bad commit: [32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
 EOF
 
-test_expect_success 'bisect log: successfull result' '
+test_expect_success 'bisect log: successful result' '
 	git bisect reset &&
 	git bisect start $HASH4 $HASH2 &&
 	git bisect good &&
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 4a2570e..e365d1f 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -292,8 +292,8 @@ test_expect_success 'setup submodule' '
 	echo content >file &&
 	git add file &&
 	git commit -m "added sub and file" &&
-	mkdir -p deep/directory/hierachy &&
-	git submodule add ./. deep/directory/hierachy/sub &&
+	mkdir -p deep/directory/hierarchy &&
+	git submodule add ./. deep/directory/hierarchy/sub &&
 	git commit -m "added another submodule" &&
 	git branch submodule
 '
@@ -485,8 +485,8 @@ test_expect_success 'moving a submodule in nested directories' '
 		# git status would fail if the update of linking git dir to
 		# work dir of the submodule failed.
 		git status &&
-		git config -f ../.gitmodules submodule.deep/directory/hierachy/sub.path >../actual &&
-		echo "directory/hierachy/sub" >../expect
+		git config -f ../.gitmodules submodule.deep/directory/hierarchy/sub.path >../actual &&
+		echo "directory/hierarchy/sub" >../expect
 	) &&
 	test_cmp actual expect
 '
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index cf3f9ec..de2405c 100755
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -581,7 +581,7 @@ test_expect_success 'log grep (9)' '
 '
 
 test_expect_success 'log grep (9)' '
-	git log -g --grep-reflog="commit: third" --author="non-existant" --pretty=tformat:%s >actual &&
+	git log -g --grep-reflog="commit: third" --author="non-existent" --pretty=tformat:%s >actual &&
 	: >expect &&
 	test_cmp expect actual
 '
diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh
index f324b9f..84787ee 100755
--- a/t/t9401-git-cvsserver-crlf.sh
+++ b/t/t9401-git-cvsserver-crlf.sh
@@ -154,7 +154,7 @@ test_expect_success 'adding files' '
     echo "more text" > src.c &&
     GIT_CONFIG="$git_config" cvs -Q add src.c >cvs.log 2>&1 &&
     marked_as . src.c "" &&
-    echo "psuedo-binary" > temp.bin
+    echo "pseudo-binary" > temp.bin
     ) &&
     GIT_CONFIG="$git_config" cvs -Q add subdir/temp.bin >cvs.log 2>&1 &&
     marked_as subdir temp.bin "-kb" &&
diff --git a/upload-pack.c b/upload-pack.c
index d4cc414..ca7f941 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -836,7 +836,7 @@ int cmd_main(int argc, const char **argv)
 		OPT_BOOL(0, "stateless-rpc", &stateless_rpc,
 			 N_("quit after a single request/response exchange")),
 		OPT_BOOL(0, "advertise-refs", &advertise_refs,
-			 N_("exit immediately after intial ref advertisement")),
+			 N_("exit immediately after initial ref advertisement")),
 		OPT_BOOL(0, "strict", &strict,
 			 N_("do not try <directory>/.git/ if <directory> is no Git directory")),
 		OPT_INTEGER(0, "timeout", &timeout,
-- 
2.5.5
Junio C Hamano· Aug 9, 2016, 18:19 UTC · re: Ville Skyttä · lore

Re: [PATCH] Spelling fixes

Ville Skyttä <ville.skytta@iki.fi> writes:
Show 25 quoted lines
> Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>
> ---
>  Documentation/RelNotes/2.3.10.txt           | 2 +-
>  Documentation/RelNotes/2.4.10.txt           | 2 +-
>  Documentation/RelNotes/2.5.4.txt            | 2 +-
>  Documentation/RelNotes/2.6.1.txt            | 2 +-
>  Documentation/git-remote-fd.txt             | 2 +-
>  Documentation/gitattributes.txt             | 2 +-
>  Documentation/gitmodules.txt                | 2 +-
>  contrib/hooks/multimail/README              | 4 ++--
>  contrib/mw-to-git/.perlcriticrc             | 2 +-
>  contrib/mw-to-git/git-remote-mediawiki.perl | 2 +-
>  contrib/subtree/t/t7900-subtree.sh          | 2 +-
>  git-p4.py                                   | 2 +-
>  sha1_file.c                                 | 2 +-
>  t/README                                    | 2 +-
>  t/t1006-cat-file.sh                         | 2 +-
>  t/t3101-ls-tree-dirname.sh                  | 2 +-
>  t/t6018-rev-list-glob.sh                    | 2 +-
>  t/t6030-bisect-porcelain.sh                 | 2 +-
>  t/t7001-mv.sh                               | 8 ++++----
>  t/t7810-grep.sh                             | 2 +-
>  t/t9401-git-cvsserver-crlf.sh               | 2 +-
>  upload-pack.c                               | 2 +-
>  22 files changed, 26 insertions(+), 26 deletions(-)

Wow, that's a lot of typos. I asked "git show --word-diff" what got changed, which told me this:

    <BAD>                     <CORRECTED>
    accidently                accidentally
    commited                  committed
    dependancy                dependency
    emtpy                     empty
    existance                 existence
    explicitely               explicitly
    git-upload-achive         git-upload-archive
    hierachy                  hierarchy
    intial                    initial
    mulitple                  multiple
    non-existant              non-existent
    precendence.              precedence.
    priviledged               privileged
    programatically           programmatically
    psuedo-binary             pseudo-binary
    soemwhere                 somewhere
    successfull               successful
    unkown                    unknown
    usefull                   useful
    writting                  writing

and then looked at all lines in the patch. They all looked reasonable.

There are two "commited" you seem to have missed, though,

t/t3420-rebase-autostash.sh: echo uncommited-content >file0 && t/t3420-rebase-autostash.sh: echo uncommited-content >expected &&

which I'll queue on top of this patch to be later squashed (i.e. no need to resend the whole thing only to add these two).

Thanks.
Ville Skyttä· Aug 9, 2016, 18:41 UTC · re: Junio C Hamano · lore

Re: [PATCH] Spelling fixes

On Tue, Aug 9, 2016 at 9:19 PM, Junio C Hamano <gitster@pobox.com> wrote: [...]

Show 7 quoted lines
> There are two "commited" you seem to have missed, though,
>
> t/t3420-rebase-autostash.sh:    echo uncommited-content >file0 &&
> t/t3420-rebase-autostash.sh:    echo uncommited-content >expected &&
>
> which I'll queue on top of this patch to be later squashed (i.e. no
> need to resend the whole thing only to add these two).
Thanks. https://github.com/client9/misspell/pull/61 :)

Also, there's SSTATE_TRANSFERING->SSTATE_TRANSFERRING in transport-helper.c, maybe you can squash that one in as well if you think it's fine?

Junio C Hamano· Aug 10, 2016, 16:59 UTC · re: Ville Skyttä · lore

Re: [PATCH] Spelling fixes

Ville Skyttä <ville.skytta@iki.fi> writes:
Show 15 quoted lines
> On Tue, Aug 9, 2016 at 9:19 PM, Junio C Hamano <gitster@pobox.com> wrote:
> [...]
>> There are two "commited" you seem to have missed, though,
>>
>> t/t3420-rebase-autostash.sh:    echo uncommited-content >file0 &&
>> t/t3420-rebase-autostash.sh:    echo uncommited-content >expected &&
>>
>> which I'll queue on top of this patch to be later squashed (i.e. no
>> need to resend the whole thing only to add these two).
>
> Thanks. https://github.com/client9/misspell/pull/61 :)
>
> Also, there's SSTATE_TRANSFERING->SSTATE_TRANSFERRING in
> transport-helper.c, maybe you can squash that one in as well if you
> think it's fine?

One comment that refers to that token spells it correctly, which is funny ;-)

Here is a squashable change I've collected so far.
Subject: [PATCH] SQUASH???
    <BAD>             <CORRECTED>
    indegee           indegree
    transfering       transferring
    uncommited        uncommitted
---
 commit-slab.h               | 2 +-
 t/t3420-rebase-autostash.sh | 4 ++--
 transport-helper.c          | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)
Show changes to 3 files +7 −7

commit-slab.h, t/t3420-rebase-autostash.sh, transport-helper.c

diff --git a/commit-slab.h b/commit-slab.h
index f84b449..be16da7 100644
--- a/commit-slab.h
+++ b/commit-slab.h
@@ -8,7 +8,7 @@
  *
  * After including this header file, using:
  *
- * define_commit_slab(indegee, int);
+ * define_commit_slab(indegree, int);
  *
  * will let you call the following functions:
  *
diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh
index 532ff5c..ab8a63e 100755
--- a/t/t3420-rebase-autostash.sh
+++ b/t/t3420-rebase-autostash.sh
@@ -179,7 +179,7 @@ testrebase " --interactive" .git/rebase-merge
 
 test_expect_success 'abort rebase -i with --autostash' '
 	test_when_finished "git reset --hard" &&
-	echo uncommited-content >file0 &&
+	echo uncommitted-content >file0 &&
 	(
 		write_script abort-editor.sh <<-\EOF &&
 			echo >"$1"
@@ -188,7 +188,7 @@ test_expect_success 'abort rebase -i with --autostash' '
 		test_must_fail git rebase -i --autostash HEAD^ &&
 		rm -f abort-editor.sh
 	) &&
-	echo uncommited-content >expected &&
+	echo uncommitted-content >expected &&
 	test_cmp expected file0
 '
 
diff --git a/transport-helper.c b/transport-helper.c
index 4208743..db2f930 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -1103,7 +1103,7 @@ static void transfer_debug(const char *fmt, ...)
 }
 
 /* Stream state: More data may be coming in this direction. */
-#define SSTATE_TRANSFERING 0
+#define SSTATE_TRANSFERRING 0
 /*
  * Stream state: No more data coming in this direction, flushing rest of
  * data.
@@ -1112,7 +1112,7 @@ static void transfer_debug(const char *fmt, ...)
 /* Stream state: Transfer in this direction finished. */
 #define SSTATE_FINISHED 2
 
-#define STATE_NEEDS_READING(state) ((state) <= SSTATE_TRANSFERING)
+#define STATE_NEEDS_READING(state) ((state) <= SSTATE_TRANSFERRING)
 #define STATE_NEEDS_WRITING(state) ((state) <= SSTATE_FLUSHING)
 #define STATE_NEEDS_CLOSING(state) ((state) == SSTATE_FLUSHING)
 
@@ -1369,7 +1369,7 @@ int bidirectional_transfer_loop(int input, int output)
 	state.ptg.dest = 1;
 	state.ptg.src_is_sock = (input == output);
 	state.ptg.dest_is_sock = 0;
-	state.ptg.state = SSTATE_TRANSFERING;
+	state.ptg.state = SSTATE_TRANSFERRING;
 	state.ptg.bufuse = 0;
 	state.ptg.src_name = "remote input";
 	state.ptg.dest_name = "stdout";
@@ -1378,7 +1378,7 @@ int bidirectional_transfer_loop(int input, int output)
 	state.gtp.dest = output;
 	state.gtp.src_is_sock = 0;
 	state.gtp.dest_is_sock = (input == output);
-	state.gtp.state = SSTATE_TRANSFERING;
+	state.gtp.state = SSTATE_TRANSFERRING;
 	state.gtp.bufuse = 0;
 	state.gtp.src_name = "stdin";
 	state.gtp.dest_name = "remote output";
-- 
2.9.2-831-g532adb1
Johannes Sixt· Aug 10, 2016, 13:26 UTC · re: Junio C Hamano · lore

Re: [PATCH] Spelling fixes

Am 09.08.2016 um 20:19 schrieb Junio C Hamano:
Show 22 quoted lines
>     <BAD>                     <CORRECTED>
> 
>     accidently                accidentally
>     commited                  committed
>     dependancy                dependency
>     emtpy                     empty
>     existance                 existence
>     explicitely               explicitly
>     git-upload-achive         git-upload-archive
>     hierachy                  hierarchy
>     intial                    initial
>     mulitple                  multiple
>     non-existant              non-existent
>     precendence.              precedence.
>     priviledged               privileged
>     programatically           programmatically
>     psuedo-binary             pseudo-binary
>     soemwhere                 somewhere
>     successfull               successful
>     unkown                    unknown
>     usefull                   useful
>     writting                  writing

This reminds me of one occurrence of "indegee" in commit-slab.h that should be "indegree". The word is not in this list above, so I don't know whether you would like to have it fixed in the same patch or not...

(BTW, is that word "in-degree" or "ingredient"?)
-- Hannes
Show changes to commit-slab.h +1 −1
diff --git a/commit-slab.h b/commit-slab.h
--- a/commit-slab.h
+++ b/commit-slab.h
@@ -8,7 +8,7 @@
  *
  * After including this header file, using:
  *
- * define_commit_slab(indegee, int);
+ * define_commit_slab(indegree, int);
  *
  * will let you call the following functions:
  *
Junio C Hamano· Aug 10, 2016, 16:55 UTC · re: Johannes Sixt · lore

Re: [PATCH] Spelling fixes

Johannes Sixt <j6t@kdbg.org> writes:
Show 29 quoted lines
> Am 09.08.2016 um 20:19 schrieb Junio C Hamano:
>>     <BAD>                     <CORRECTED>
>> 
>>     accidently                accidentally
>>     commited                  committed
>>     dependancy                dependency
>>     emtpy                     empty
>>     existance                 existence
>>     explicitely               explicitly
>>     git-upload-achive         git-upload-archive
>>     hierachy                  hierarchy
>>     intial                    initial
>>     mulitple                  multiple
>>     non-existant              non-existent
>>     precendence.              precedence.
>>     priviledged               privileged
>>     programatically           programmatically
>>     psuedo-binary             pseudo-binary
>>     soemwhere                 somewhere
>>     successfull               successful
>>     unkown                    unknown
>>     usefull                   useful
>>     writting                  writing
>
> This reminds me of one occurrence of "indegee" in commit-slab.h that
> should be "indegree". The word is not in this list above, so I don't
> know whether you would like to have it fixed in the same patch or not...
>
> (BTW, is that word "in-degree" or "ingredient"?)

IIRC it is the former, to count "how many incoming arcs does this node have?"

Will queue to squash in.  Thanks.
Show 14 quoted lines
> -- Hannes
>
> diff --git a/commit-slab.h b/commit-slab.h
> --- a/commit-slab.h
> +++ b/commit-slab.h
> @@ -8,7 +8,7 @@
>   *
>   * After including this header file, using:
>   *
> - * define_commit_slab(indegee, int);
> + * define_commit_slab(indegree, int);
>   *
>   * will let you call the following functions:
>   *

← back to recent threads