undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/commit-is-spelled-with-two-ems'

Browse Source 
* jc/commit-is-spelled-with-two-ems:
  typofix: cherry is spelled with two ars
  typofix: commit is spelled with two ems
This commit is contained in:
Junio C Hamano 2013-09-12 14:41:38 -07:00
commit af9a0cade3
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
notes-utils.h
View File

@ -9,7 +9,7 @@
* Properties of the created commit: * Properties of the created commit:
* - tree: the result of converting t to a tree object with write_notes_tree(). * - 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. * - 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 * - commit message: msg
* *
* The resulting commit SHA1 is stored in result_sha1. * The resulting commit SHA1 is stored in result_sha1.

2
t/t3501-revert-cherry-pick.sh
View File

@ -100,7 +100,7 @@ test_expect_success 'revert forbidden on dirty working tree' '
' '
test_expect_success 'chery-pick on unborn branch' ' test_expect_success 'cherry-pick on unborn branch' '
git checkout --orphan unborn && git checkout --orphan unborn &&
git rm --cached -r . && git rm --cached -r . &&
rm -rf * && rm -rf * &&

2
t/t3506-cherry-pick-ff.sh
View File

@ -105,7 +105,7 @@ test_expect_success 'cherry pick a root commit with --ff' '
test "$(git rev-parse --verify HEAD)" = "1df192cd8bc58a2b275d842cede4d221ad9000d1" test "$(git rev-parse --verify HEAD)" = "1df192cd8bc58a2b275d842cede4d221ad9000d1"
' '
test_expect_success 'chery-pick --ff on unborn branch' ' test_expect_success 'cherry-pick --ff on unborn branch' '
git checkout --orphan unborn && git checkout --orphan unborn &&
git rm --cached -r . && git rm --cached -r . &&
rm -rf * && rm -rf * &&

2
t/t3509-cherry-pick-merge-df.sh
View File

@ -74,7 +74,7 @@ test_expect_success 'Setup rename with file on one side matching different dirna
echo content > sub/file && echo content > sub/file &&
echo foo > othersub/whatever && echo foo > othersub/whatever &&
git add -A && git add -A &&
git commit -m "Common commmit" && git commit -m "Common commit" &&
git rm -rf othersub && git rm -rf othersub &&
git mv sub/file othersub && git mv sub/file othersub &&

14
t/t6022-merge-rename.sh
View File

@ -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 && printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >sub/file &&
echo foo >dir/file-in-the-way && echo foo >dir/file-in-the-way &&
git add -A && git add -A &&
git commit -m "Common commmit" && git commit -m "Common commit" &&
echo 11 >>sub/file && echo 11 >>sub/file &&
echo more >>dir/file-in-the-way && 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 && mkdir one &&
echo stuff >one/file && echo stuff >one/file &&
git add -A && git add -A &&
git commit -m "Common commmit" && git commit -m "Common commit" &&
git mv one/file destdir && git mv one/file destdir &&
git commit -m "Renamed to 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 stuff >one/file &&
echo other >two/file && echo other >two/file &&
git add -A && git add -A &&
git commit -m "Common commmit" && git commit -m "Common commit" &&
git rm -rf one && git rm -rf one &&
git mv two/file 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 && echo stuff >original &&
git add -A && git add -A &&
git commit -m "Common commmit" && git commit -m "Common commit" &&
mkdir two && mkdir two &&
>two/file && >two/file &&
@ -583,7 +583,7 @@ test_expect_success 'setup rename one file to two; directories moving out of the
mkdir one two && mkdir one two &&
touch one/file two/file && touch one/file two/file &&
git add -A && git add -A &&
git commit -m "Common commmit" && git commit -m "Common commit" &&
git rm -rf one && git rm -rf one &&
git mv original 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 && printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >original &&
git add -A && git add -A &&
git commit -m "Common commmit" && git commit -m "Common commit" &&
git mv original rename && git mv original rename &&
echo 11 >>rename && echo 11 >>rename &&
@ -649,7 +649,7 @@ test_expect_success 'setup to test avoiding unnecessary update, with D/F conflic
mkdir df && mkdir df &&
printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >df/file && printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >df/file &&
git add -A && git add -A &&
git commit -m "Common commmit" && git commit -m "Common commit" &&
git mv df/file temp && git mv df/file temp &&
rm -rf df && rm -rf df &&