Skip to content

Commit a316b95

Browse files
committed
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 <[email protected]>
1 parent e230c56 commit a316b95

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

notes-utils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Properties of the created commit:
1010
* - tree: the result of converting t to a tree object with write_notes_tree().
1111
* - parents: the given parents OR (if NULL) the commit referenced by t->ref.
12-
* - author/committer: the default determined by commmit_tree().
12+
* - author/committer: the default determined by commit_tree().
1313
* - commit message: msg
1414
*
1515
* The resulting commit SHA1 is stored in result_sha1.

t/t3509-cherry-pick-merge-df.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ test_expect_success 'Setup rename with file on one side matching different dirna
7474
echo content > sub/file &&
7575
echo foo > othersub/whatever &&
7676
git add -A &&
77-
git commit -m "Common commmit" &&
77+
git commit -m "Common commit" &&
7878
7979
git rm -rf othersub &&
8080
git mv sub/file othersub &&

t/t6022-merge-rename.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ test_expect_success 'setup for rename + d/f conflicts' '
259259
printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >sub/file &&
260260
echo foo >dir/file-in-the-way &&
261261
git add -A &&
262-
git commit -m "Common commmit" &&
262+
git commit -m "Common commit" &&
263263
264264
echo 11 >>sub/file &&
265265
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
439439
mkdir one &&
440440
echo stuff >one/file &&
441441
git add -A &&
442-
git commit -m "Common commmit" &&
442+
git commit -m "Common commit" &&
443443
444444
git mv one/file destdir &&
445445
git commit -m "Renamed to destdir" &&
@@ -479,7 +479,7 @@ test_expect_success 'setup pair rename to parent of other (D/F conflicts)' '
479479
echo stuff >one/file &&
480480
echo other >two/file &&
481481
git add -A &&
482-
git commit -m "Common commmit" &&
482+
git commit -m "Common commit" &&
483483
484484
git rm -rf one &&
485485
git mv two/file one &&
@@ -539,7 +539,7 @@ test_expect_success 'setup rename of one file to two, with directories in the wa
539539
540540
echo stuff >original &&
541541
git add -A &&
542-
git commit -m "Common commmit" &&
542+
git commit -m "Common commit" &&
543543
544544
mkdir two &&
545545
>two/file &&
@@ -583,7 +583,7 @@ test_expect_success 'setup rename one file to two; directories moving out of the
583583
mkdir one two &&
584584
touch one/file two/file &&
585585
git add -A &&
586-
git commit -m "Common commmit" &&
586+
git commit -m "Common commit" &&
587587
588588
git rm -rf one &&
589589
git mv original one &&
@@ -618,7 +618,7 @@ test_expect_success 'setup avoid unnecessary update, normal rename' '
618618
619619
printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >original &&
620620
git add -A &&
621-
git commit -m "Common commmit" &&
621+
git commit -m "Common commit" &&
622622
623623
git mv original rename &&
624624
echo 11 >>rename &&
@@ -649,7 +649,7 @@ test_expect_success 'setup to test avoiding unnecessary update, with D/F conflic
649649
mkdir df &&
650650
printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >df/file &&
651651
git add -A &&
652-
git commit -m "Common commmit" &&
652+
git commit -m "Common commit" &&
653653
654654
git mv df/file temp &&
655655
rm -rf df &&

0 commit comments

Comments
 (0)