Spelling fixes

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

Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes/2.3.10.txt b/Documentation/RelNotes/2.3.10.txt
index 9d425d814ddf360f89dc7f5c794e4d72b437ef51..20c2d2caccfb846977feb740f781bbe82543293d 100644 (file)
--- 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
  * 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
    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 8621199bc671718f67d26a84cf1e92bc75715bbf..702d8d4e224ee6bfd75c75c01e5c95db8a9d63b1 100644 (file)
--- 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
  * 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
    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 a5e8477a4a6bee8a7da10b353ddd5e8c5458c669..b8a2f93ee707e5e25903253d7a007c8a3de8b807 100644 (file)
--- 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
  * 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
    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 1e51363e3c107a0dd22fc8a436f5138915365136..f37ea89cda2f1c8576909e71ba04ec7475ea2b7c 100644 (file)
--- 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
  * 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
    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 e700bafa473007e42d8f0af8d35d15841e6e3988..80afca866c0f819ca4b66a9c8a311859e875ffa8 100644 (file)
--- 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
 
 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.
 
 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 34db3e219b285f13f8435ebd5307c2185fec15bf..807577a59fd4beed28d87746a22e78ae3c0b418c 100644 (file)
--- 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 `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::
 
 
 Unspecified::
 

diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 0849d281bb79b8a394a00f50fc09a10aba15d4f2..10dcc08ff9977ecd0803915aade4b58a27495bbf 100644 (file)
--- 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
 
 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.
 
 
        clone.
 
 

diff --git a/commit-slab.h b/commit-slab.h
index f84b449413d434b8145426503a98bcd4f9ad995f..be16da7728a4f2e507fda5d3d79b011b7f4a6a97 100644 (file)
--- a/commit-slab.h
+++ b/commit-slab.h
@@ -8,7 +8,7 @@
  *
  * After including this header file, using:
  *
  *
  * After including this header file, using:
  *

- * define_commit_slab(indegee, int);
+ * define_commit_slab(indegree, int);

  *
  * will let you call the following functions:
  *
  *
  * will let you call the following functions:
  *

diff --git a/contrib/hooks/multimail/README b/contrib/hooks/multimail/README
index 0c91d19a57093a8676b126a3cc531840e6898d89..22a23cdb94ee1b6ad4cffebbf7f724529680129b 100644 (file)
--- 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.
 
     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.
 
     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
 
 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
     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 5a9955d757fe163a6ac46ad331a6bb629398b1f6..158958d36357bd217f8b257cbdbdc65b049d6c07 100644 (file)
--- a/contrib/mw-to-git/.perlcriticrc
+++ b/contrib/mw-to-git/.perlcriticrc
@@ -19,7 +19,7 @@
 [InputOutput::RequireCheckedSyscalls]
 functions = open say close
 
 [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]
 
 # wished.
 [-ValuesAndExpressions::ProhibitConstantPragma]
 

diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
index 8dd74a9a406e9cfd685ea1af3947e4bea4c82f90..41e74fba1e1b1a0b310160e98c0fa26a74e859ca 100755 (executable)
--- 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;
        }
                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 = {
        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 9751cfe9e63d6510dd7af0b6be5f7028df49bf88..3c87ebaf57baede9810c3b9b489eed9751189706 100755 (executable)
--- 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,
 
                # 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)" ""
        )
                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 ac6f4c14fba8e459318d9e038327fbb34bea2361..fd5ca524626c40823371422e52a3457fd1d45579 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -1934,7 +1934,7 @@ def run(self, args):
         if self.useClientSpec:
             self.clientSpecDirs = getClientSpec()
 
         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:
         branchesDetected = (len(p4BranchesInGit().keys()) > 1)
 
         if self.useClientSpec and not branchesDetected:

diff --git a/sha1_file.c b/sha1_file.c
index 3066b5f71c1eb2916081967f396c8427e3e75406..7026e4ba78cad2077b4dfbb998b8e732c2d2f424 100644 (file)
--- 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
                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))
         * option.
         */
        if ((flags & LOOKUP_UNKNOWN_OBJECT) && (type < 0))

diff --git a/t/README b/t/README
index 76a0daa3ac00d298bc515c655f4548403095f5f3..0f764c0aef7aaa842299abde05effb73a0def9f4 100644 (file)
--- 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
     $ 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'
 
 
     $ 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 4f38078ff36f5a877defc360feaf6fdba804ccc1..b19f3326946203409fe0e428b9fc73d34134d756 100755 (executable)
--- a/t/t1006-cat-file.sh
+++ b/t/t1006-cat-file.sh
@@ -231,7 +231,7 @@ $tag_content
        | git cat-file --batch)"
 '
 
        | 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)"
 '
 
     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 425d858938f51bdb8745b28e92c74246e618ef07..327ded4000b47cf3f4da42515fb803c47c0bd742 100755 (executable)
--- 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
 
     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
 entries.  Also test odd filename and missing entries handling.
 '
 . ./test-lib.sh

diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh
index 532ff5cbd1cbbce8bdbc83660d3084b938886c60..ab8a63e8d6dc643b28eb0c74ba3f032b7532226f 100755 (executable)
--- 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" &&
 
 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"
        (
                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
        ) &&
                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
 '
 
        test_cmp expected file0
 '
 

diff --git a/t/t6018-rev-list-glob.sh b/t/t6018-rev-list-glob.sh
index d00f7db8687b8bedcbc810735a16c65df2324c18..381f35ed16d152e7926774587c1c0a006a600ee6 100755 (executable)
--- 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
 
 
 # "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
 # 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 86d1380b9c0bf526e0732ebc027232dcc7bf577d..5e5370feb40c851fa29bdec17d687eb5f22502bb 100755 (executable)
--- 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
 
 # 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 &&
        git bisect reset &&
        git bisect start $HASH4 $HASH2 &&
        git bisect good &&

diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 4a2570ed959410ca34503c6260141f10debd752b..e365d1ff77ee30e0f40b8f01c7e70ebc74e97901 100755 (executable)
--- 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" &&
        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
 '
        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 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
 '
        ) &&
        test_cmp actual expect
 '

diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index cf3f9ec63187f17cbfab40aaa3d514e281004275..de2405ccba29016d2b83e16482bcfcbe70429e46 100755 (executable)
--- 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)' '
 '
 
 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
 '
        : >expect &&
        test_cmp expect actual
 '

diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh
index f324b9f010506d5f79388ef454df74156860ec13..84787eee9acec4b65f2404356e06b2f4904cea42 100755 (executable)
--- 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 "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" &&
     ) &&
     GIT_CONFIG="$git_config" cvs -Q add subdir/temp.bin >cvs.log 2>&1 &&
     marked_as subdir temp.bin "-kb" &&

diff --git a/transport-helper.c b/transport-helper.c
index 4208743605e99259f6b318c294f1c0b5d1a54f06..db2f930c740348bbe55525a2e471857b6dc463f1 100644 (file)
--- 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. */
 }
 
 /* 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.
 /*
  * 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
 
 /* 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)
 
 #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.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";
        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.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";
        state.gtp.bufuse = 0;
        state.gtp.src_name = "stdin";
        state.gtp.dest_name = "remote output";

diff --git a/upload-pack.c b/upload-pack.c
index d4cc414bc218d193225d7b7891638b3798173254..ca7f9417800bfb27a7dbc0559df8bec772c267fa 100644 (file)
--- 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,
                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,
                OPT_BOOL(0, "strict", &strict,
                         N_("do not try <directory>/.git/ if <directory> is no Git directory")),
                OPT_INTEGER(0, "timeout", &timeout,