Spelling fixes

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

diff --git a/Documentation/RelNotes/1.7.10.1.txt b/Documentation/RelNotes/1.7.10.1.txt
index be68524cff388af3540db1f3237c417da3b84a35..71a86cb7c6d87ff60bce1f91504cca03511e4e56 100644 (file)
--- a/Documentation/RelNotes/1.7.10.1.txt
+++ b/Documentation/RelNotes/1.7.10.1.txt
@@ -69,7 +69,7 @@ Fixes since v1.7.10
  * The 'push to upstream' implementation was broken in some corner
    cases. "git push $there" without refspec, when the current branch
    is set to push to a remote different from $there, used to push to
  * The 'push to upstream' implementation was broken in some corner
    cases. "git push $there" without refspec, when the current branch
    is set to push to a remote different from $there, used to push to

-   $there using the upstream information to a remote unreleated to
+   $there using the upstream information to a remote unrelated to

    $there.
 
  * Giving "--continue" to a conflicted "rebase -i" session skipped a
    $there.
 
  * Giving "--continue" to a conflicted "rebase -i" session skipped a

diff --git a/Documentation/RelNotes/2.12.0.txt b/Documentation/RelNotes/2.12.0.txt
index 29154805b4e56010955d961726cfda4c8325eca2..ef8b97da9b84342422cc2519a78e782f264c339d 100644 (file)
--- a/Documentation/RelNotes/2.12.0.txt
+++ b/Documentation/RelNotes/2.12.0.txt
@@ -264,7 +264,7 @@ notes for details).
    needed it so far.
 
  * Git 2.11 had a minor regression in "merge --ff-only" that competed
    needed it so far.
 
  * Git 2.11 had a minor regression in "merge --ff-only" that competed

-   with another process that simultanously attempted to update the
+   with another process that simultaneously attempted to update the

    index. We used to explain what went wrong with an error message,
    but the new code silently failed.  The error message has been
    resurrected.
    index. We used to explain what went wrong with an error message,
    but the new code silently failed.  The error message has been
    resurrected.

diff --git a/Documentation/RelNotes/2.14.0.txt b/Documentation/RelNotes/2.14.0.txt
index 8b80058a8539ff4ddcf18c0669f982fd9b2d026a..eedc33d2cd6f126d97fa0b6d0a192f6eeee1f9ce 100644 (file)
--- a/Documentation/RelNotes/2.14.0.txt
+++ b/Documentation/RelNotes/2.14.0.txt
@@ -54,7 +54,7 @@ UI, Workflows & Features
    even when the other side hasn't enabled allowTipSHA1InWant.
 
  * The recently introduced "[includeIf "gitdir:$dir"] path=..."
    even when the other side hasn't enabled allowTipSHA1InWant.
 
  * The recently introduced "[includeIf "gitdir:$dir"] path=..."

-   mechansim has further been taught to take symlinks into account.
+   mechanism has further been taught to take symlinks into account.

    The directory "$dir" specified in "gitdir:$dir" may be a symlink to
    a real location, not something that $(getcwd) may return.  In such
    a case, a realpath of "$dir" is compared with the real path of the
    The directory "$dir" specified in "gitdir:$dir" may be a symlink to
    a real location, not something that $(getcwd) may return.  In such
    a case, a realpath of "$dir" is compared with the real path of the

diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 70f3753e1e90f74bb41e8a9ce90dcf7dc4420192..1d697d996220b23d5ac660e809563296ecd1c574 100644 (file)
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -294,7 +294,7 @@ $ git reset --keep start                    <3>
 
 Split a commit apart into a sequence of commits::
 +
 
 Split a commit apart into a sequence of commits::
 +

-Suppose that you have created lots of logically separate changes and commited
+Suppose that you have created lots of logically separate changes and committed

 them together. Then, later you decide that it might be better to have each
 logical chunk associated with its own commit. You can use git reset to rewind
 history without changing the contents of your local files, and then successively
 them together. Then, later you decide that it might be better to have each
 logical chunk associated with its own commit. You can use git reset to rewind
 history without changing the contents of your local files, and then successively

diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 74bc6200d564c6aa72183e393f7c7d2e0c00bf7d..2aea2c1b9b89867bbecf89395ec1480a9fff7050 100644 (file)
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -141,7 +141,7 @@ you can also just use `git submodule update --init` without
 the explicit 'init' step if you do not intend to customize
 any submodule locations.
 +
 the explicit 'init' step if you do not intend to customize
 any submodule locations.
 +

-See the add subcommand for the defintion of default remote.
+See the add subcommand for the definition of default remote.

 
 deinit [-f|--force] (--all|[--] <path>...)::
        Unregister the given submodules, i.e. remove the whole
 
 deinit [-f|--force] (--all|[--] <path>...)::
        Unregister the given submodules, i.e. remove the whole

diff --git a/abspath.c b/abspath.c
index 7f1cfe97929ea33efb81adfcc97b82f334dccb3d..708aff8d42c562112fe4076635af903c7f41fbaa 100644 (file)
--- a/abspath.c
+++ b/abspath.c
@@ -183,7 +183,7 @@ char *strbuf_realpath(struct strbuf *resolved, const char *path,
 
                        /*
                         * use the symlink as the remaining components that
 
                        /*
                         * use the symlink as the remaining components that

-                        * need to be resloved
+                        * need to be resolved

                         */
                        strbuf_swap(&symlink, &remaining);
                }
                         */
                        strbuf_swap(&symlink, &remaining);
                }

diff --git a/builtin/grep.c b/builtin/grep.c
index f61a9d938b44424414812c57eecc309bd563f4b3..f752f642fffc757979c3727c55ed3bb14d7d524c 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -647,7 +647,7 @@ static int grep_submodule(struct grep_opt *opt, const struct object_id *oid,
                return 0;
        if (!is_submodule_populated_gently(path, NULL)) {
                /*
                return 0;
        if (!is_submodule_populated_gently(path, NULL)) {
                /*

-                * If searching history, check for the presense of the
+                * If searching history, check for the presence of the

                 * submodule's gitdir before skipping the submodule.
                 */
                if (oid) {
                 * submodule's gitdir before skipping the submodule.
                 */
                if (oid) {

diff --git a/compat/regex/regexec.c b/compat/regex/regexec.c
index eb5e1d44397cdad8f0db910e39037cf6b39f35a9..0a745d9c3b375fbfdefa3afcd021b952cef0e685 100644 (file)
--- a/compat/regex/regexec.c
+++ b/compat/regex/regexec.c
@@ -4102,7 +4102,7 @@ extend_buffers (re_match_context_t *mctx)
   if (BE (INT_MAX / 2 / sizeof (re_dfastate_t *) <= pstr->bufs_len, 0))
     return REG_ESPACE;
 
   if (BE (INT_MAX / 2 / sizeof (re_dfastate_t *) <= pstr->bufs_len, 0))
     return REG_ESPACE;
 

-  /* Double the lengthes of the buffers.  */
+  /* Double the lengths of the buffers.  */

   ret = re_string_realloc_buffers (pstr, pstr->bufs_len * 2);
   if (BE (ret != REG_NOERROR, 0))
     return ret;
   ret = re_string_realloc_buffers (pstr, pstr->bufs_len * 2);
   if (BE (ret != REG_NOERROR, 0))
     return ret;

diff --git a/contrib/hooks/multimail/git_multimail.py b/contrib/hooks/multimail/git_multimail.py
index c7f86403cf0750289b08be6d7d66180c78242f0c..73fdda6b14e331871cf4879ba85906b09cc0add3 100755 (executable)
--- a/contrib/hooks/multimail/git_multimail.py
+++ b/contrib/hooks/multimail/git_multimail.py
@@ -2964,7 +2964,7 @@ def get_revision_recipients(self, revision):
 
 
 class CLIRecipientsEnvironmentMixin(Environment):
 
 
 class CLIRecipientsEnvironmentMixin(Environment):

-    """Mixin storing recipients information comming from the
+    """Mixin storing recipients information coming from the

     command-line."""
 
     def __init__(self, cli_recipients=None, **kw):
     command-line."""
 
     def __init__(self, cli_recipients=None, **kw):

diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
index 41e74fba1e1b1a0b310160e98c0fa26a74e859ca..e7f857c1a2882c7c701af3e2ce6c3223bfd88c7c 100755 (executable)
--- a/contrib/mw-to-git/git-remote-mediawiki.perl
+++ b/contrib/mw-to-git/git-remote-mediawiki.perl
@@ -857,7 +857,7 @@ sub mw_import_revids {
 
        my $n = 0;
        my $n_actual = 0;
 
        my $n = 0;
        my $n_actual = 0;

-       my $last_timestamp = 0; # Placeholer in case $rev->timestamp is undefined
+       my $last_timestamp = 0; # Placeholder in case $rev->timestamp is undefined

 
        foreach my $pagerevid (@{$revision_ids}) {
                # Count page even if we skip it, since we display
 
        foreach my $pagerevid (@{$revision_ids}) {
                # Count page even if we skip it, since we display

diff --git a/contrib/mw-to-git/t/README b/contrib/mw-to-git/t/README
index 03f6ee5d72f5096e287c23e048746fe1f756f062..2ee34be7e491d34d3dfd7b8236de59bcd777b942 100644 (file)
--- a/contrib/mw-to-git/t/README
+++ b/contrib/mw-to-git/t/README
@@ -121,4 +121,4 @@ How to write a new test
 
 Please, follow the standards given by git. See git/t/README.
 New file should be named as t936[0-9]-*.sh.
 
 Please, follow the standards given by git. See git/t/README.
 New file should be named as t936[0-9]-*.sh.

-Be sure to reset your wiki regulary with the function `wiki_reset`.
+Be sure to reset your wiki regularly with the function `wiki_reset`.

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index d8209c7a02d8753af4724f385a4ea783384536f6..3d4a8ee27c96a8e1eb94f95771aeca7825f8a076 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -3125,7 +3125,7 @@ sub git_get_projects_list {
        return @list;
 }
 
        return @list;
 }
 

-# written with help of Tree::Trie module (Perl Artistic License, GPL compatibile)
+# written with help of Tree::Trie module (Perl Artistic License, GPL compatible)

 # as side effects it sets 'forks' field to list of forks for forked projects
 sub filter_forks_from_projects_list {
        my $projects = shift;
 # as side effects it sets 'forks' field to list of forks for forked projects
 sub filter_forks_from_projects_list {
        my $projects = shift;


@@ -4376,7 +4376,7 @@ sub git_print_page_nav {
              "</div>\n";
 }
 
              "</div>\n";
 }
 

-# returns a submenu for the nagivation of the refs views (tags, heads,
+# returns a submenu for the navigation of the refs views (tags, heads,

 # remotes) with the current view disabled and the remotes view only
 # available if the feature is enabled
 sub format_ref_views {
 # remotes) with the current view disabled and the remotes view only
 # available if the feature is enabled
 sub format_ref_views {

diff --git a/mailinfo.c b/mailinfo.c
index 1652ec11f5b173ad8078a7598590f6f198e2dbb9..bd574cb75210334b1a4628f182743b49bd389cd7 100644 (file)
--- a/mailinfo.c
+++ b/mailinfo.c
@@ -58,17 +58,17 @@ static void parse_bogus_from(struct mailinfo *mi, const struct strbuf *line)
 static const char *unquote_comment(struct strbuf *outbuf, const char *in)
 {
        int c;
 static const char *unquote_comment(struct strbuf *outbuf, const char *in)
 {
        int c;

-       int take_next_litterally = 0;
+       int take_next_literally = 0;

 
        strbuf_addch(outbuf, '(');
 
        while ((c = *in++) != 0) {
 
        strbuf_addch(outbuf, '(');
 
        while ((c = *in++) != 0) {

-               if (take_next_litterally == 1) {
-                       take_next_litterally = 0;
+               if (take_next_literally == 1) {
+                       take_next_literally = 0;

                } else {
                        switch (c) {
                        case '\\':
                } else {
                        switch (c) {
                        case '\\':

-                               take_next_litterally = 1;
+                               take_next_literally = 1;

                                continue;
                        case '(':
                                in = unquote_comment(outbuf, in);
                                continue;
                        case '(':
                                in = unquote_comment(outbuf, in);


@@ -88,15 +88,15 @@ static const char *unquote_comment(struct strbuf *outbuf, const char *in)
 static const char *unquote_quoted_string(struct strbuf *outbuf, const char *in)
 {
        int c;
 static const char *unquote_quoted_string(struct strbuf *outbuf, const char *in)
 {
        int c;

-       int take_next_litterally = 0;
+       int take_next_literally = 0;

 
        while ((c = *in++) != 0) {
 
        while ((c = *in++) != 0) {

-               if (take_next_litterally == 1) {
-                       take_next_litterally = 0;
+               if (take_next_literally == 1) {
+                       take_next_literally = 0;

                } else {
                        switch (c) {
                        case '\\':
                } else {
                        switch (c) {
                        case '\\':

-                               take_next_litterally = 1;
+                               take_next_literally = 1;

                                continue;
                        case '"':
                                return in;
                                continue;
                        case '"':
                                return in;

diff --git a/pathspec.c b/pathspec.c
index a5f4df31eab7fd465c2e68c7a400287756c34c51..e2a23ebc9668b066d337391e96139af49907edfa 100644 (file)
--- a/pathspec.c
+++ b/pathspec.c
@@ -606,7 +606,7 @@ void parse_pathspec(struct pathspec *pathspec,
 
        /*
         * If everything is an exclude pattern, add one positive pattern
 
        /*
         * If everything is an exclude pattern, add one positive pattern

-        * that matches everyting. We allocated an extra one for this.
+        * that matches everything. We allocated an extra one for this.

         */
        if (nr_exclude == n) {
                int plen = (!(flags & PATHSPEC_PREFER_CWD)) ? 0 : prefixlen;
         */
        if (nr_exclude == n) {
                int plen = (!(flags & PATHSPEC_PREFER_CWD)) ? 0 : prefixlen;

diff --git a/perl/Git/I18N.pm b/perl/Git/I18N.pm
index c41425c8d07a4b9a223ef3fb71e24ff526cb9fc9..836a5c23826328f7175faa6f9008b0534a4d1861 100644 (file)
--- a/perl/Git/I18N.pm
+++ b/perl/Git/I18N.pm
@@ -74,7 +74,7 @@ =head1 SYNOPSIS
 
        printf __("The following error occurred: %s\n"), $error;
 
 
        printf __("The following error occurred: %s\n"), $error;
 

-       printf __n("commited %d file\n", "commited %d files\n", $files), $files;
+       printf __n("committed %d file\n", "committed %d files\n", $files), $files;

 
 
 =head1 DESCRIPTION
 
 
 =head1 DESCRIPTION

diff --git a/refs.h b/refs.h
index aa4ecc83d050a717a9932cf540bb4b5692b39c61..6daa78eb50ddc195c6d5bfb568d0b05ab08f7923 100644 (file)
--- a/refs.h
+++ b/refs.h
@@ -574,7 +574,7 @@ int ref_transaction_verify(struct ref_transaction *transaction,
 #define TRANSACTION_GENERIC_ERROR -2
 
 /*
 #define TRANSACTION_GENERIC_ERROR -2
 
 /*

- * Perform the preparatory stages of commiting `transaction`. Acquire
+ * Perform the preparatory stages of committing `transaction`. Acquire

  * any needed locks, check preconditions, etc.; basically, do as much
  * as possible to ensure that the transaction will be able to go
  * through, stopping just short of making any irrevocable or
  * any needed locks, check preconditions, etc.; basically, do as much
  * as possible to ensure that the transaction will be able to go
  * through, stopping just short of making any irrevocable or


@@ -586,7 +586,7 @@ int ref_transaction_verify(struct ref_transaction *transaction,
  * On failure, abort the transaction, write an error message to `err`,
  * and return one of the `TRANSACTION_*` constants.
  *
  * On failure, abort the transaction, write an error message to `err`,
  * and return one of the `TRANSACTION_*` constants.
  *

- * Callers who don't need such fine-grained control over commiting
+ * Callers who don't need such fine-grained control over committing

  * reference transactions should just call `ref_transaction_commit()`.
  */
 int ref_transaction_prepare(struct ref_transaction *transaction,
  * reference transactions should just call `ref_transaction_commit()`.
  */
 int ref_transaction_prepare(struct ref_transaction *transaction,

diff --git a/send-pack.c b/send-pack.c
index ed3cee3211bb80fac5c52bfe542a2b06fb308584..11d6f3d98398e8b7a1add501dd7ee85a736531b6 100644 (file)
--- a/send-pack.c
+++ b/send-pack.c
@@ -133,7 +133,7 @@ static int pack_objects(int fd, struct ref *refs, struct oid_array *extra, struc
                 * For a normal non-zero exit, we assume pack-objects wrote
                 * something useful to stderr. For death by signal, though,
                 * we should mention it to the user. The exception is SIGPIPE
                 * For a normal non-zero exit, we assume pack-objects wrote
                 * something useful to stderr. For death by signal, though,
                 * we should mention it to the user. The exception is SIGPIPE

-                * (141), because that's a normal occurence if the remote end
+                * (141), because that's a normal occurrence if the remote end

                 * hangs up (and we'll report that by trying to read the unpack
                 * status).
                 */
                 * hangs up (and we'll report that by trying to read the unpack
                 * status).
                 */

diff --git a/sha1dc/sha1.c b/sha1dc/sha1.c
index facea1bb560b57bbe7419dd1cce49f6b1172ddca..3a1735e5ca4d169c22446f4a6c84bfbb55c55ce4 100644 (file)
--- a/sha1dc/sha1.c
+++ b/sha1dc/sha1.c
@@ -918,7 +918,7 @@ static void sha1recompress_fast_ ## t (uint32_t ihvin[5], uint32_t ihvout[5], co
 
 #ifdef _MSC_VER
 #pragma warning(push)
 
 #ifdef _MSC_VER
 #pragma warning(push)

-#pragma warning(disable: 4127)  /* Complier complains about the checks in the above macro being constant. */
+#pragma warning(disable: 4127)  /* Compiler complains about the checks in the above macro being constant. */

 #endif
 
 #ifdef DOSTORESTATE0
 #endif
 
 #ifdef DOSTORESTATE0

diff --git a/submodule.c b/submodule.c
index da0b805493b9e7cd4c26f027a9f24c823109850a..71e0c5a85b2c3c52bf400f4712ceb447b814f769 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -846,9 +846,9 @@ static int submodule_has_commits(const char *path, struct oid_array *commits)
        int has_commit = 1;
 
        /*
        int has_commit = 1;
 
        /*

-        * Perform a cheap, but incorrect check for the existance of 'commits'.
+        * Perform a cheap, but incorrect check for the existence of 'commits'.

         * This is done by adding the submodule's object store to the in-core
         * This is done by adding the submodule's object store to the in-core

-        * object store, and then querying for each commit's existance.  If we
+        * object store, and then querying for each commit's existence.  If we

         * do not have the commit object anywhere, there is no chance we have
         * it in the object store of the correct submodule and have it
         * reachable from a ref, so we can fail early without spawning rev-list
         * do not have the commit object anywhere, there is no chance we have
         * it in the object store of the correct submodule and have it
         * reachable from a ref, so we can fail early without spawning rev-list

diff --git a/t/helper/test-strcmp-offset.c b/t/helper/test-strcmp-offset.c
index 4a45a54e92745f1ec0102a01b05b338b846cd1d4..e159c9a127f6854541ab497c8fd4b6efb9d4ea39 100644 (file)
--- a/t/helper/test-strcmp-offset.c
+++ b/t/helper/test-strcmp-offset.c
@@ -11,7 +11,7 @@ int cmd_main(int argc, const char **argv)
        result = strcmp_offset(argv[1], argv[2], &offset);
 
        /*
        result = strcmp_offset(argv[1], argv[2], &offset);
 
        /*

-        * Because differnt CRTs behave differently, only rely on signs
+        * Because different CRTs behave differently, only rely on signs

         * of the result values.
         */
        result = (result < 0 ? -1 :
         * of the result values.
         */
        result = (result < 0 ? -1 :

diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh
index 84a9028c433c02c72adcdf06222bcb409e2eb683..1bdf38e80dbe5322fc239371eb71b146a40586e0 100755 (executable)
--- a/t/t2203-add-intent.sh
+++ b/t/t2203-add-intent.sh
@@ -129,10 +129,10 @@ test_expect_success 'cache-tree does skip dir that becomes empty' '
        )
 '
 
        )
 '
 

-test_expect_success 'commit: ita entries ignored in empty intial commit check' '
-       git init empty-intial-commit &&
+test_expect_success 'commit: ita entries ignored in empty initial commit check' '
+       git init empty-initial-commit &&

        (
        (

-               cd empty-intial-commit &&
+               cd empty-initial-commit &&

                : >one &&
                git add -N one &&
                test_must_fail git commit -m nothing-new-here
                : >one &&
                git add -N one &&
                test_must_fail git commit -m nothing-new-here

diff --git a/t/t3070-wildmatch.sh b/t/t3070-wildmatch.sh
index 8fd70d3aa25f05593826ff9a788c7935b0925ef8..163a14a1c2cb77b2a644a7342fd554940f7dd2e3 100755 (executable)
--- a/t/t3070-wildmatch.sh
+++ b/t/t3070-wildmatch.sh
@@ -235,7 +235,7 @@ pathmatch 1 abcXdefXghi '*X*i'
 pathmatch 1 ab/cXd/efXg/hi '*/*X*/*/*i'
 pathmatch 1 ab/cXd/efXg/hi '*Xg*i'
 
 pathmatch 1 ab/cXd/efXg/hi '*/*X*/*/*i'
 pathmatch 1 ab/cXd/efXg/hi '*Xg*i'
 

-# Case-sensitivy features
+# Case-sensitivity features

 match 0 x 'a' '[A-Z]'
 match 1 x 'A' '[A-Z]'
 match 0 x 'A' '[a-z]'
 match 0 x 'a' '[A-Z]'
 match 1 x 'A' '[A-Z]'
 match 0 x 'A' '[a-z]'

diff --git a/t/t4213-log-tabexpand.sh b/t/t4213-log-tabexpand.sh
index e01a8f6ac9c0f2557f075979bc81d9e948e29f35..7f90f58c03e6fff921e65f9b4138de9dcf972941 100755 (executable)
--- a/t/t4213-log-tabexpand.sh
+++ b/t/t4213-log-tabexpand.sh
@@ -37,7 +37,7 @@ count_expand ()
 
        # Prefix the output with the command line arguments, and
        # replace SP with a dot both in the expecte and actual output
 
        # Prefix the output with the command line arguments, and
        # replace SP with a dot both in the expecte and actual output

-       # so that test_cmp would show the differene together with the
+       # so that test_cmp would show the difference together with the

        # breakage in a way easier to consume by the debugging user.
        {
                echo "git show -s $*"
        # breakage in a way easier to consume by the debugging user.
        {
                echo "git show -s $*"

diff --git a/t/t5614-clone-submodules-shallow.sh b/t/t5614-clone-submodules-shallow.sh
index a87d329656da6685e9d0846714f20a5aeeaa3556..e4e6ea4d527faa46ca30d0f09839bc3ac0aa2392 100755 (executable)
--- a/t/t5614-clone-submodules-shallow.sh
+++ b/t/t5614-clone-submodules-shallow.sh
@@ -71,7 +71,7 @@ test_expect_success 'clone follows shallow recommendation' '
        test_when_finished "rm -rf super_clone" &&
        git config -f .gitmodules submodule.sub.shallow true &&
        git add .gitmodules &&
        test_when_finished "rm -rf super_clone" &&
        git config -f .gitmodules submodule.sub.shallow true &&
        git add .gitmodules &&

-       git commit -m "recommed shallow for sub" &&
+       git commit -m "recommend shallow for sub" &&

        git clone --recurse-submodules --no-local "file://$pwd/." super_clone &&
        (
                cd super_clone &&
        git clone --recurse-submodules --no-local "file://$pwd/." super_clone &&
        (
                cd super_clone &&


@@ -105,7 +105,7 @@ test_expect_success 'clone follows non shallow recommendation' '
        test_when_finished "rm -rf super_clone" &&
        git config -f .gitmodules submodule.sub.shallow false &&
        git add .gitmodules &&
        test_when_finished "rm -rf super_clone" &&
        git config -f .gitmodules submodule.sub.shallow false &&
        git add .gitmodules &&

-       git commit -m "recommed non shallow for sub" &&
+       git commit -m "recommend non shallow for sub" &&

        git clone --recurse-submodules --no-local "file://$pwd/." super_clone &&
        (
                cd super_clone &&
        git clone --recurse-submodules --no-local "file://$pwd/." super_clone &&
        (
                cd super_clone &&

diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index 16952e44fcfd705e115b81099bdbff809ff1520d..aa74eb8f0d5dfb4f228b1e8c7b9dbbc0b88adb4d 100755 (executable)
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -244,7 +244,7 @@ test_expect_success 'setup and absorb a submodule' '
        test_cmp expect out
 '
 
        test_cmp expect out
 '
 

-test_expect_success 'describe chokes on severly broken submodules' '
+test_expect_success 'describe chokes on severely broken submodules' '

        mv .git/modules/sub1/ .git/modules/sub_moved &&
        test_must_fail git describe --dirty
 '
        mv .git/modules/sub1/ .git/modules/sub_moved &&
        test_must_fail git describe --dirty
 '

diff --git a/t/t7412-submodule-absorbgitdirs.sh b/t/t7412-submodule-absorbgitdirs.sh
index e2bbb449b6a175c6dbb9f43b08f2fa7061d5d9f5..ce74c12da2daccd26edbb92070e5ff4eb1f09f9c 100755 (executable)
--- a/t/t7412-submodule-absorbgitdirs.sh
+++ b/t/t7412-submodule-absorbgitdirs.sh
@@ -33,7 +33,7 @@ test_expect_success 'absorb the git dir' '
        test_cmp expect.2 actual.2
 '
 
        test_cmp expect.2 actual.2
 '
 

-test_expect_success 'absorbing does not fail for deinitalized submodules' '
+test_expect_success 'absorbing does not fail for deinitialized submodules' '

        test_when_finished "git submodule update --init" &&
        git submodule deinit --all &&
        git submodule absorbgitdirs &&
        test_when_finished "git submodule update --init" &&
        git submodule deinit --all &&
        git submodule absorbgitdirs &&

diff --git a/t/t7413-submodule-is-active.sh b/t/t7413-submodule-is-active.sh
index 9c785b07ec241440c64beed917ba248b1092b43a..c8e7e983317610b54da89101bea8f7c59a4dcec3 100755 (executable)
--- a/t/t7413-submodule-is-active.sh
+++ b/t/t7413-submodule-is-active.sh
@@ -2,7 +2,7 @@
 
 test_description='Test submodule--helper is-active
 
 
 test_description='Test submodule--helper is-active
 

-This test verifies that `git submodue--helper is-active` correclty identifies
+This test verifies that `git submodue--helper is-active` correctly identifies

 submodules which are "active" and interesting to the user.
 '
 
 submodules which are "active" and interesting to the user.
 '
 

diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 2e0ba3ebd8ab3273144743dc38675e2b5d429ea1..67b8c50a5ab431345de2909209811fc8e4f12548 100755 (executable)
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -2822,7 +2822,7 @@ test_expect_success 'S: filemodify with garbage after sha1 must fail' '
 #
 # notemodify, three ways to say dataref
 #
 #
 # notemodify, three ways to say dataref
 #

-test_expect_success 'S: notemodify with garabge after mark dataref must fail' '
+test_expect_success 'S: notemodify with garbage after mark dataref must fail' '

        test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
        commit refs/heads/S
        committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
        test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
        commit refs/heads/S
        committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE