Correct common spelling mistakes in comments and tests

Most of these were found using Lucas De Marchi's codespell tool.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/apply.c b/builtin/apply.c
index 06f5320b18bc5690ae944a722d19ec5496687228..f6a3c97dd5903a8b7d42383da370428067c3e14e 100644 (file)
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -1921,7 +1921,7 @@ static int parse_binary(char *buffer, unsigned long size, struct patch *patch)
 }
 
 /*
 }
 
 /*

- * Read the patch text in "buffer" taht extends for "size" bytes; stop
+ * Read the patch text in "buffer" that extends for "size" bytes; stop

  * reading after seeing a single patch (i.e. changes to a single file).
  * Create fragments (i.e. patch hunks) and hang them to the given patch.
  * Return the number of bytes consumed, so that the caller can call us
  * reading after seeing a single patch (i.e. changes to a single file).
  * Create fragments (i.e. patch hunks) and hang them to the given patch.
  * Return the number of bytes consumed, so that the caller can call us


@@ -3025,7 +3025,7 @@ static struct patch *in_fn_table(const char *name)
  *
  * The latter is needed to deal with a case where two paths A and B
  * are swapped by first renaming A to B and then renaming B to A;
  *
  * The latter is needed to deal with a case where two paths A and B
  * are swapped by first renaming A to B and then renaming B to A;

- * moving A to B should not be prevented due to presense of B as we
+ * moving A to B should not be prevented due to presence of B as we

  * will remove it in a later patch.
  */
 #define PATH_TO_BE_DELETED ((struct patch *) -2)
  * will remove it in a later patch.
  */
 #define PATH_TO_BE_DELETED ((struct patch *) -2)


@@ -3509,7 +3509,7 @@ static int check_patch(struct patch *patch)
         *
         * A patch to swap-rename between A and B would first rename A
         * to B and then rename B to A.  While applying the first one,
         *
         * A patch to swap-rename between A and B would first rename A
         * to B and then rename B to A.  While applying the first one,

-        * the presense of B should not stop A from getting renamed to
+        * the presence of B should not stop A from getting renamed to

         * B; ask to_be_deleted() about the later rename.  Removal of
         * B and rename from A to B is handled the same way by asking
         * was_deleted().
         * B; ask to_be_deleted() about the later rename.  Removal of
         * B and rename from A to B is handled the same way by asking
         * was_deleted().

diff --git a/commit.c b/commit.c
index e8eb0aec5509a4fd09698bd15a37d1f4e8341f5e..1a41757ee377d804782ccfb4e27c54b607dcf91d 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -834,7 +834,7 @@ struct commit_list *get_merge_bases(struct commit *one, struct commit *two,
 }
 
 /*
 }
 
 /*

- * Is "commit" a decendant of one of the elements on the "with_commit" list?
+ * Is "commit" a descendant of one of the elements on the "with_commit" list?

  */
 int is_descendant_of(struct commit *commit, struct commit_list *with_commit)
 {
  */
 int is_descendant_of(struct commit *commit, struct commit_list *with_commit)
 {

diff --git a/commit.h b/commit.h
index 4138bb4c0850f95ba7215cb62f457cd682495968..252c7f871c1c90423ae11190ba98cea5b94422de 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -164,7 +164,7 @@ extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *r
 extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos, int cleanup);
 extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
 
 extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos, int cleanup);
 extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
 

-/* largest postive number a signed 32-bit integer can contain */
+/* largest positive number a signed 32-bit integer can contain */

 #define INFINITE_DEPTH 0x7fffffff
 
 extern int register_shallow(const unsigned char *sha1);
 #define INFINITE_DEPTH 0x7fffffff
 
 extern int register_shallow(const unsigned char *sha1);

diff --git a/diff.c b/diff.c
index db952a5bc71ac967cb045bada8c71f5fda218ca2..0eb26535f52adf516961672628f2810e55a31a9d 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -1565,7 +1565,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
         * Binary files are displayed with "Bin XXX -> YYY bytes"
         * instead of the change count and graph. This part is treated
         * similarly to the graph part, except that it is not
         * Binary files are displayed with "Bin XXX -> YYY bytes"
         * instead of the change count and graph. This part is treated
         * similarly to the graph part, except that it is not

-        * "scaled". If total width is too small to accomodate the
+        * "scaled". If total width is too small to accommodate the

         * guaranteed minimum width of the filename part and the
         * separators and this message, this message will "overflow"
         * making the line longer than the maximum width.
         * guaranteed minimum width of the filename part and the
         * separators and this message, this message will "overflow"
         * making the line longer than the maximum width.

diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 710764abb132f16e393fd16178b845d8160e37cf..d2c4ce6e1e88f543bd06cd8347e8949fef11a381 100755 (executable)
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -1247,7 +1247,7 @@ sub summarize_hunk {
 
 
 # Print a one-line summary of each hunk in the array ref in
 
 
 # Print a one-line summary of each hunk in the array ref in

-# the first argument, starting wih the index in the 2nd.
+# the first argument, starting with the index in the 2nd.

 sub display_hunks {
        my ($hunks, $i) = @_;
        my $ctr = 0;
 sub display_hunks {
        my ($hunks, $i) = @_;
        my $ctr = 0;

diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index f1c3f49a836a8cf7f980bd3bc99d4fe9c2d49b65..a0d796e57087e0ca5bac94520997ecacec9fd295 100755 (executable)
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -2911,7 +2911,7 @@ sub filenamesplit
 }
 
 # Cleanup various junk in filename (try to canonicalize it), and
 }
 
 # Cleanup various junk in filename (try to canonicalize it), and

-# add prependdir to accomodate running CVS client from a
+# add prependdir to accommodate running CVS client from a

 # subdirectory (so the output is relative to top directory of the project).
 sub filecleanup
 {
 # subdirectory (so the output is relative to top directory of the project).
 sub filecleanup
 {


@@ -4583,7 +4583,7 @@ sub getmeta
     #     the numerical value of the corresponding byte plus
     #     100.
     #      - "plus 100" avoids "0"s, and also reduces the
     #     the numerical value of the corresponding byte plus
     #     100.
     #      - "plus 100" avoids "0"s, and also reduces the

-    #        likelyhood of a collision in the case that someone someday
+    #        likelihood of a collision in the case that someone someday

     #        writes an import tool that tries to preserve original
     #        CVS revision numbers, and the original CVS data had done
     #        lots of branches off of branches and other strangeness to
     #        writes an import tool that tries to preserve original
     #        CVS revision numbers, and the original CVS data had done
     #        lots of branches off of branches and other strangeness to

diff --git a/git-quiltimport.sh b/git-quiltimport.sh
index 9a6ba2b9874e12d31adeba354d8d44436ceadaf3..8e17525dd86aa614000d9b335f9671a829678901 100755 (executable)
--- a/git-quiltimport.sh
+++ b/git-quiltimport.sh
@@ -59,7 +59,7 @@ tmp_patch="$tmp_dir/patch"
 tmp_info="$tmp_dir/info"
 
 
 tmp_info="$tmp_dir/info"
 
 

-# Find the intial commit
+# Find the initial commit

 commit=$(git rev-parse HEAD)
 
 mkdir $tmp_dir || exit 2
 commit=$(git rev-parse HEAD)
 
 mkdir $tmp_dir || exit 2

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 1309196d27e675013825cdac8afd6d7328e44b1f..80950c018d54f3bbb7b700286b4923d39cbe2d00 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -683,7 +683,7 @@ sub evaluate_gitweb_config {
        our $GITWEB_CONFIG_SYSTEM = $ENV{'GITWEB_CONFIG_SYSTEM'} || "++GITWEB_CONFIG_SYSTEM++";
        our $GITWEB_CONFIG_COMMON = $ENV{'GITWEB_CONFIG_COMMON'} || "++GITWEB_CONFIG_COMMON++";
 
        our $GITWEB_CONFIG_SYSTEM = $ENV{'GITWEB_CONFIG_SYSTEM'} || "++GITWEB_CONFIG_SYSTEM++";
        our $GITWEB_CONFIG_COMMON = $ENV{'GITWEB_CONFIG_COMMON'} || "++GITWEB_CONFIG_COMMON++";
 

-       # Protect agains duplications of file names, to not read config twice.
+       # Protect against duplications of file names, to not read config twice.

        # Only one of $GITWEB_CONFIG and $GITWEB_CONFIG_SYSTEM is used, so
        # there possibility of duplication of filename there doesn't matter.
        $GITWEB_CONFIG = ""        if ($GITWEB_CONFIG eq $GITWEB_CONFIG_COMMON);
        # Only one of $GITWEB_CONFIG and $GITWEB_CONFIG_SYSTEM is used, so
        # there possibility of duplication of filename there doesn't matter.
        $GITWEB_CONFIG = ""        if ($GITWEB_CONFIG eq $GITWEB_CONFIG_COMMON);


@@ -1136,7 +1136,7 @@ sub handle_errors_html {
 
        # to avoid infinite loop where error occurs in die_error,
        # change handler to default handler, disabling handle_errors_html
 
        # to avoid infinite loop where error occurs in die_error,
        # change handler to default handler, disabling handle_errors_html

-       set_message("Error occured when inside die_error:\n$msg");
+       set_message("Error occurred when inside die_error:\n$msg");

 
        # you cannot jump out of die_error when called as error handler;
        # the subroutine set via CGI::Carp::set_message is called _after_
 
        # you cannot jump out of die_error when called as error handler;
        # the subroutine set via CGI::Carp::set_message is called _after_


@@ -7485,7 +7485,7 @@ sub git_object {
                system(git_cmd(), "cat-file", '-e', $hash_base) == 0
                        or die_error(404, "Base object does not exist");
 
                system(git_cmd(), "cat-file", '-e', $hash_base) == 0
                        or die_error(404, "Base object does not exist");
 

-               # here errors should not hapen
+               # here errors should not happen

                open my $fd, "-|", git_cmd(), "ls-tree", $hash_base, "--", $file_name
                        or die_error(500, "Open git-ls-tree failed");
                my $line = <$fd>;
                open my $fd, "-|", git_cmd(), "ls-tree", $hash_base, "--", $file_name
                        or die_error(500, "Open git-ls-tree failed");
                my $line = <$fd>;

diff --git a/perl/Git.pm b/perl/Git.pm
index 57a17160f9decb7879b8d6cba741ddb6d593be47..f207b47183a00fc02320a3785a8d4085b42259fe 100644 (file)
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -1026,7 +1026,7 @@ sub _close_cat_blob {
 
 =item temp_acquire ( NAME )
 
 
 =item temp_acquire ( NAME )
 

-Attempts to retreive the temporary file mapped to the string C<NAME>. If an
+Attempts to retrieve the temporary file mapped to the string C<NAME>. If an

 associated temp file has not been created this session or was closed, it is
 created, cached, and set for autoflush and binmode.
 
 associated temp file has not been created this session or was closed, it is
 created, cached, and set for autoflush and binmode.
 

diff --git a/perl/Git/I18N.pm b/perl/Git/I18N.pm
index 40dd8971912d6b387bde7c9bb04cc6896521acec..f889fd6da91d2d9b6a7469442a02e5478f094f8d 100644 (file)
--- a/perl/Git/I18N.pm
+++ b/perl/Git/I18N.pm
@@ -68,7 +68,7 @@ =head1 SYNOPSIS
 
        print __("Welcome to Git!\n");
 
 
        print __("Welcome to Git!\n");
 

-       printf __("The following error occured: %s\n"), $error;
+       printf __("The following error occurred: %s\n"), $error;

 
 =head1 DESCRIPTION
 
 
 =head1 DESCRIPTION
 

diff --git a/perl/private-Error.pm b/perl/private-Error.pm
index ea14ab270a790d161750088f263d928896e0213c..6098135ae2b2d473729373b69e776f475cf919dd 100644 (file)
--- a/perl/private-Error.pm
+++ b/perl/private-Error.pm
@@ -769,7 +769,7 @@ =head1 PRE-DEFINED ERROR CLASSES
 overload methods.
 
 If the text value ends with C<at file line 1> as $@ strings do, then
 overload methods.
 
 If the text value ends with C<at file line 1> as $@ strings do, then

-this infomation will be used to set the C<-file> and C<-line> arguments
+this information will be used to set the C<-file> and C<-line> arguments

 of the error object.
 
 This class is used internally if an eval'd block die's with an error
 of the error object.
 
 This class is used internally if an eval'd block die's with an error

diff --git a/sequencer.c b/sequencer.c
index aef5e8a0170c5b337f1aa3ac7a35be3b54957729..bad5077911667e11e522043ae09875489d4591c4 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -133,7 +133,7 @@ static void print_advice(int show_hint, struct replay_opts *opts)
        if (msg) {
                fprintf(stderr, "%s\n", msg);
                /*
        if (msg) {
                fprintf(stderr, "%s\n", msg);
                /*

-                * A conflict has occured but the porcelain
+                * A conflict has occurred but the porcelain

                 * (typically rebase --interactive) wants to take care
                 * of the commit itself so remove CHERRY_PICK_HEAD
                 */
                 * (typically rebase --interactive) wants to take care
                 * of the commit itself so remove CHERRY_PICK_HEAD
                 */

diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh
index d8b7f2ffbcc0427b1ae9d48feb4387f580e81d61..9820f70c84d93b9461ae6663e6ab5b3cd735e3d5 100755 (executable)
--- a/t/t1006-cat-file.sh
+++ b/t/t1006-cat-file.sh
@@ -116,9 +116,9 @@ tree_pretty_content="100644 blob $hello_sha1        hello"
 
 run_tests 'tree' $tree_sha1 $tree_size "" "$tree_pretty_content"
 
 
 run_tests 'tree' $tree_sha1 $tree_size "" "$tree_pretty_content"
 

-commit_message="Intial commit"
+commit_message="Initial commit"

 commit_sha1=$(echo_without_newline "$commit_message" | git commit-tree $tree_sha1)
 commit_sha1=$(echo_without_newline "$commit_message" | git commit-tree $tree_sha1)

-commit_size=176
+commit_size=177

 commit_content="tree $tree_sha1
 author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> 0000000000 +0000
 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 0000000000 +0000
 commit_content="tree $tree_sha1
 author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> 0000000000 +0000
 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 0000000000 +0000

diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 098a6ae4a086ccfeb8c658a80773eb07c9d66441..9fab25cc96b079349a3ca3caffbd8d2bc322265c 100755 (executable)
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -319,7 +319,7 @@ test_expect_success PERL 'split hunk "add -p (edit)"' '
        # times to get out.
        #
        # 2. Correct version applies the (not)edited version, and asks
        # times to get out.
        #
        # 2. Correct version applies the (not)edited version, and asks

-       #    about the next hunk, against wich we say q and program
+       #    about the next hunk, against which we say q and program

        #    exits.
        for a in s e     q n q q
        do
        #    exits.
        for a in s e     q n q q
        do

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index bb1fc47fe8aa6904555c153f90a6026c45bf3645..183fbe5bb3ea533f8f5f76f397d53671f912d6b0 100755 (executable)
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -742,21 +742,21 @@ test_expect_success 'format-patch --signature --cover-letter' '
        test 2 = $(grep "my sig" output | wc -l)
 '
 
        test 2 = $(grep "my sig" output | wc -l)
 '
 

-test_expect_success 'format.signature="" supresses signatures' '
+test_expect_success 'format.signature="" suppresses signatures' '

        git config format.signature "" &&
        git format-patch --stdout -1 >output &&
        check_patch output &&
        ! grep "^-- \$" output
 '
 
        git config format.signature "" &&
        git format-patch --stdout -1 >output &&
        check_patch output &&
        ! grep "^-- \$" output
 '
 

-test_expect_success 'format-patch --no-signature supresses signatures' '
+test_expect_success 'format-patch --no-signature suppresses signatures' '

        git config --unset-all format.signature &&
        git format-patch --stdout --no-signature -1 >output &&
        check_patch output &&
        ! grep "^-- \$" output
 '
 
        git config --unset-all format.signature &&
        git format-patch --stdout --no-signature -1 >output &&
        check_patch output &&
        ! grep "^-- \$" output
 '
 

-test_expect_success 'format-patch --signature="" supresses signatures' '
+test_expect_success 'format-patch --signature="" suppresses signatures' '

        git format-patch --stdout --signature="" -1 >output &&
        check_patch output &&
        ! grep "^-- \$" output
        git format-patch --stdout --signature="" -1 >output &&
        check_patch output &&
        ! grep "^-- \$" output

diff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh
index 6f6ee88b28bc5417035b45d87aaf4a9c974ab6c5..581a801649f20a74e81c32f9503f233c3cd3d507 100755 (executable)
--- a/t/t4124-apply-ws-rule.sh
+++ b/t/t4124-apply-ws-rule.sh
@@ -47,7 +47,7 @@ test_fix () {
        # find touched lines
        $DIFF file target | sed -n -e "s/^> //p" >fixed
 
        # find touched lines
        $DIFF file target | sed -n -e "s/^> //p" >fixed
 

-       # the changed lines are all expeced to change
+       # the changed lines are all expected to change

        fixed_cnt=$(wc -l <fixed)
        case "$1" in
        '') expect_cnt=$fixed_cnt ;;
        fixed_cnt=$(wc -l <fixed)
        case "$1" in
        '') expect_cnt=$fixed_cnt ;;

diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 3e0e15fb3e0b92ab7e95789d27db34d9a1fa423c..8bf99e10a3f862e8502fc901b1ea5d7c16e947c9 100755 (executable)
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -190,7 +190,7 @@ test_expect_success 'bisect start: no ".git/BISECT_START" if checkout error' '
 # $HASH1 is good, $HASH4 is bad, we skip $HASH3
 # but $HASH2 is bad,
 # so we should find $HASH2 as the first bad commit
 # $HASH1 is good, $HASH4 is bad, we skip $HASH3
 # but $HASH2 is bad,
 # so we should find $HASH2 as the first bad commit

-test_expect_success 'bisect skip: successfull result' '
+test_expect_success 'bisect skip: successful result' '

        git bisect reset &&
        git bisect start $HASH4 $HASH1 &&
        git bisect skip &&
        git bisect reset &&
        git bisect start $HASH4 $HASH1 &&
        git bisect skip &&

diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh
index b44b29395049308b30e61b00a55e2eb39f4355a1..25dac798894f6a3cb4b62c8b9ba944bfc1d82d9f 100755 (executable)
--- a/t/t7601-merge-pull-config.sh
+++ b/t/t7601-merge-pull-config.sh
@@ -109,7 +109,7 @@ test_expect_success 'setup conflicted merge' '
 '
 
 # First do the merge with resolve and recursive then verify that
 '
 
 # First do the merge with resolve and recursive then verify that

-# recusive is choosen.
+# recusive is chosen.

 
 test_expect_success 'merge picks up the best result' '
        git config --unset-all pull.twohead &&
 
 test_expect_success 'merge picks up the best result' '
        git config --unset-all pull.twohead &&

diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index bc38737b2a5ebd9b7ba20fcb92ac87c48b9496c8..d526b1d96a2e98bc304f4d36eaaa60858080e63d 100755 (executable)
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -237,7 +237,7 @@ test_expect_success 'mergetool takes partial path' '
     git submodule update -N &&
     test_must_fail git merge master &&
 
     git submodule update -N &&
     test_must_fail git merge master &&
 

-    #shouldnt need these lines
+    #should not need these lines

     #( yes "d" | git mergetool file11 >/dev/null 2>&1 ) &&
     #( yes "d" | git mergetool file12 >/dev/null 2>&1 ) &&
     #( yes "l" | git mergetool submod >/dev/null 2>&1 ) &&
     #( yes "d" | git mergetool file11 >/dev/null 2>&1 ) &&
     #( yes "d" | git mergetool file12 >/dev/null 2>&1 ) &&
     #( yes "l" | git mergetool submod >/dev/null 2>&1 ) &&

diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 97d6f4c7de57c54adfd5fed6401dbd168b5f3064..ebd5c5db45c8816f39b2d8c60775f455ab9c48aa 100755 (executable)
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -101,7 +101,7 @@ test_expect_success $PREREQ \
 
 test_expect_success $PREREQ 'Send patches with --envelope-sender' '
     clean_fake_sendmail &&
 
 test_expect_success $PREREQ 'Send patches with --envelope-sender' '
     clean_fake_sendmail &&

-     git send-email --envelope-sender="Patch Contributer <patch@example.com>" --suppress-cc=sob --from="Example <nobody@example.com>" --to=nobody@example.com --smtp-server="$(pwd)/fake.sendmail" $patches 2>errors
+     git send-email --envelope-sender="Patch Contributor <patch@example.com>" --suppress-cc=sob --from="Example <nobody@example.com>" --to=nobody@example.com --smtp-server="$(pwd)/fake.sendmail" $patches 2>errors

 '
 
 test_expect_success $PREREQ 'setup expect' '
 '
 
 test_expect_success $PREREQ 'setup expect' '


@@ -787,7 +787,7 @@ test_expect_success $PREREQ 'confirm detects EOF (auto causes failure)' '
        test $ret = "0"
 '
 
        test $ret = "0"
 '
 

-test_expect_success $PREREQ 'confirm doesnt loop forever' '
+test_expect_success $PREREQ 'confirm does not loop forever' '

        CONFIRM=$(git config --get sendemail.confirm) &&
        git config sendemail.confirm auto &&
        GIT_SEND_EMAIL_NOTTY=1 &&
        CONFIRM=$(git config --get sendemail.confirm) &&
        git config sendemail.confirm auto &&
        GIT_SEND_EMAIL_NOTTY=1 &&

diff --git a/transport-helper.c b/transport-helper.c
index cb3ef7d38e475480a5d81ce6077c4c87ea09a318..dcd8d97411dd15e01ba1480a44b2a998043b424a 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -991,7 +991,7 @@ struct unidirectional_transfer {
        int src_is_sock;
        /* Is destination socket? */
        int dest_is_sock;
        int src_is_sock;
        /* Is destination socket? */
        int dest_is_sock;

-       /* Transfer state (TRANSFERING/FLUSHING/FINISHED) */
+       /* Transfer state (TRANSFERRING/FLUSHING/FINISHED) */

        int state;
        /* Buffer. */
        char buf[BUFFERSIZE];
        int state;
        /* Buffer. */
        char buf[BUFFERSIZE];

diff --git a/transport.h b/transport.h
index a3450e97c0d0d94778a4b635efdd53b724eb70c2..e7beb815dd546cf67cb84255d3ca894878f48ae7 100644 (file)
--- a/transport.h
+++ b/transport.h
@@ -74,7 +74,7 @@ struct transport {
                       const char *executable, int fd[2]);
 
        /** get_refs_list(), fetch(), and push_refs() can keep
                       const char *executable, int fd[2]);
 
        /** get_refs_list(), fetch(), and push_refs() can keep

-        * resources (such as a connection) reserved for futher
+        * resources (such as a connection) reserved for further

         * use. disconnect() releases these resources.
         **/
        int (*disconnect)(struct transport *connection);
         * use. disconnect() releases these resources.
         **/
        int (*disconnect)(struct transport *connection);

diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index 1b7012a119ad3ea7e2ebe0aad80891529d4936da..b2eb6db2c851aea7eb08b17d802155876bef211c 100644 (file)
--- a/xdiff/xdiffi.c
+++ b/xdiff/xdiffi.c
@@ -490,7 +490,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
 
                /*
                 * Try to move back the possibly merged group of changes, to match
 
                /*
                 * Try to move back the possibly merged group of changes, to match

-                * the recorded postion in the other file.
+                * the recorded position in the other file.

                 */
                while (ixref < ix) {
                        rchg[--ixs] = 1;
                 */
                while (ixref < ix) {
                        rchg[--ixs] = 1;

diff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c
index bf99787c3e4c791426311495dda9d4da81cbb571..73210cb6f3fb5d1cb90b1c5959a5a90e058ea1f2 100644 (file)
--- a/xdiff/xhistogram.c
+++ b/xdiff/xhistogram.c
@@ -55,7 +55,7 @@ struct histindex {
        struct record {
                unsigned int ptr, cnt;
                struct record *next;
        struct record {
                unsigned int ptr, cnt;
                struct record *next;

-       } **records, /* an ocurrence */
+       } **records, /* an occurrence */

          **line_map; /* map of line to record chain */
        chastore_t rcha;
        unsigned int *next_ptrs;
          **line_map; /* map of line to record chain */
        chastore_t rcha;
        unsigned int *next_ptrs;