typofix: commit is spelled with two ems

There are a handful of instances where we say commmit when we mean
commit.  Fix them.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/notes-utils.h b/notes-utils.h
index b4cb1bfb4332a7e370071ac6699a9cf48e4da44c..564e30cccd550f9acbd493f43c940bab1abba427 100644 (file)
--- a/notes-utils.h
+++ b/notes-utils.h
@@ -9,7 +9,7 @@
  * Properties of the created commit:
  * - tree: the result of converting t to a tree object with write_notes_tree().
  * - parents: the given parents OR (if NULL) the commit referenced by t->ref.
  * Properties of the created commit:
  * - tree: the result of converting t to a tree object with write_notes_tree().
  * - parents: the given parents OR (if NULL) the commit referenced by t->ref.

- * - author/committer: the default determined by commmit_tree().
+ * - author/committer: the default determined by commit_tree().

  * - commit message: msg
  *
  * The resulting commit SHA1 is stored in result_sha1.
  * - commit message: msg
  *
  * The resulting commit SHA1 is stored in result_sha1.

diff --git a/t/t3509-cherry-pick-merge-df.sh b/t/t3509-cherry-pick-merge-df.sh
index a5b6a5f3310316d289aee0961fcb6a2ae26fca99..1e5b3948dfc5d28a070ba83db361163002e7c3ae 100755 (executable)
--- a/t/t3509-cherry-pick-merge-df.sh
+++ b/t/t3509-cherry-pick-merge-df.sh
@@ -74,7 +74,7 @@ test_expect_success 'Setup rename with file on one side matching different dirna
        echo content > sub/file &&
        echo foo > othersub/whatever &&
        git add -A &&
        echo content > sub/file &&
        echo foo > othersub/whatever &&
        git add -A &&

-       git commit -m "Common commmit" &&
+       git commit -m "Common commit" &&

 
        git rm -rf othersub &&
        git mv sub/file othersub &&
 
        git rm -rf othersub &&
        git mv sub/file othersub &&

diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
index c680f789a7028f5300a4665ca068c9a7e87bb22a..a89dfbef08a5a9ff2d4c8727b67b44279fe522e5 100755 (executable)
--- a/t/t6022-merge-rename.sh
+++ b/t/t6022-merge-rename.sh
@@ -259,7 +259,7 @@ test_expect_success 'setup for rename + d/f conflicts' '
        printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >sub/file &&
        echo foo >dir/file-in-the-way &&
        git add -A &&
        printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >sub/file &&
        echo foo >dir/file-in-the-way &&
        git add -A &&

-       git commit -m "Common commmit" &&
+       git commit -m "Common commit" &&

 
        echo 11 >>sub/file &&
        echo more >>dir/file-in-the-way &&
 
        echo 11 >>sub/file &&
        echo more >>dir/file-in-the-way &&


@@ -439,7 +439,7 @@ test_expect_success 'setup both rename source and destination involved in D/F co
        mkdir one &&
        echo stuff >one/file &&
        git add -A &&
        mkdir one &&
        echo stuff >one/file &&
        git add -A &&

-       git commit -m "Common commmit" &&
+       git commit -m "Common commit" &&

 
        git mv one/file destdir &&
        git commit -m "Renamed to destdir" &&
 
        git mv one/file destdir &&
        git commit -m "Renamed to destdir" &&


@@ -479,7 +479,7 @@ test_expect_success 'setup pair rename to parent of other (D/F conflicts)' '
        echo stuff >one/file &&
        echo other >two/file &&
        git add -A &&
        echo stuff >one/file &&
        echo other >two/file &&
        git add -A &&

-       git commit -m "Common commmit" &&
+       git commit -m "Common commit" &&

 
        git rm -rf one &&
        git mv two/file one &&
 
        git rm -rf one &&
        git mv two/file one &&


@@ -539,7 +539,7 @@ test_expect_success 'setup rename of one file to two, with directories in the wa
 
        echo stuff >original &&
        git add -A &&
 
        echo stuff >original &&
        git add -A &&

-       git commit -m "Common commmit" &&
+       git commit -m "Common commit" &&

 
        mkdir two &&
        >two/file &&
 
        mkdir two &&
        >two/file &&


@@ -583,7 +583,7 @@ test_expect_success 'setup rename one file to two; directories moving out of the
        mkdir one two &&
        touch one/file two/file &&
        git add -A &&
        mkdir one two &&
        touch one/file two/file &&
        git add -A &&

-       git commit -m "Common commmit" &&
+       git commit -m "Common commit" &&

 
        git rm -rf one &&
        git mv original one &&
 
        git rm -rf one &&
        git mv original one &&


@@ -618,7 +618,7 @@ test_expect_success 'setup avoid unnecessary update, normal rename' '
 
        printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >original &&
        git add -A &&
 
        printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >original &&
        git add -A &&

-       git commit -m "Common commmit" &&
+       git commit -m "Common commit" &&

 
        git mv original rename &&
        echo 11 >>rename &&
 
        git mv original rename &&
        echo 11 >>rename &&


@@ -649,7 +649,7 @@ test_expect_success 'setup to test avoiding unnecessary update, with D/F conflic
        mkdir df &&
        printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >df/file &&
        git add -A &&
        mkdir df &&
        printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >df/file &&
        git add -A &&

-       git commit -m "Common commmit" &&
+       git commit -m "Common commit" &&

 
        git mv df/file temp &&
        rm -rf df &&
 
        git mv df/file temp &&
        rm -rf df &&