diff options
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1004-read-tree-m-u-wf.sh | 2 | ||||
| -rwxr-xr-x | t/t1020-subdirectory.sh | 6 | ||||
| -rwxr-xr-x | t/t3800-mktag.sh | 4 | ||||
| -rwxr-xr-x | t/t5000-tar-tree.sh | 2 | ||||
| -rwxr-xr-x | t/t5600-clone-fail-cleanup.sh | 2 | ||||
| -rwxr-xr-x | t/t9101-git-svn-props.sh | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/t/t1004-read-tree-m-u-wf.sh b/t/t1004-read-tree-m-u-wf.sh index 4f664f6ad..c11420a8b 100755 --- a/t/t1004-read-tree-m-u-wf.sh +++ b/t/t1004-read-tree-m-u-wf.sh @@ -87,7 +87,7 @@ test_expect_success 'three-way not complaining on an untracked path in both' ' git-read-tree -m -u branch-point master side ' -test_expect_success 'three-way not cloberring a working tree file' ' +test_expect_success 'three-way not clobbering a working tree file' ' git reset --hard && rm -f file2 subdir/file2 file3 subdir/file3 && diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh index c090c9618..1e8f9e59d 100755 --- a/t/t1020-subdirectory.sh +++ b/t/t1020-subdirectory.sh @@ -106,21 +106,21 @@ test_expect_success 'read-tree' ' cmp ../one ../original.one ' -test_expect_success 'no file/rev ambuguity check inside .git' ' +test_expect_success 'no file/rev ambiguity check inside .git' ' cd $HERE && git commit -a -m 1 && cd $HERE/.git && git show -s HEAD ' -test_expect_success 'no file/rev ambuguity check inside a bare repo' ' +test_expect_success 'no file/rev ambiguity check inside a bare repo' ' cd $HERE && git clone -s --bare .git foo.git && cd foo.git && GIT_DIR=. git show -s HEAD ' # This still does not work as it should... -: test_expect_success 'no file/rev ambuguity check inside a bare repo' ' +: test_expect_success 'no file/rev ambiguity check inside a bare repo' ' cd $HERE && git clone -s --bare .git foo.git && cd foo.git && git show -s HEAD diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh index ede4d4249..7c7e4335d 100755 --- a/t/t3800-mktag.sh +++ b/t/t3800-mktag.sh @@ -172,7 +172,7 @@ EOF check_verify_failure 'verify tag-name check' ############################################################ -# 11. tagger line lable check #1 +# 11. tagger line label check #1 cat >tag.sig <<EOF object $head @@ -187,7 +187,7 @@ EOF check_verify_failure '"tagger" line label check #1' ############################################################ -# 12. tagger line lable check #2 +# 12. tagger line label check #2 cat >tag.sig <<EOF object $head diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh index cf08e9279..ac835fe43 100755 --- a/t/t5000-tar-tree.sh +++ b/t/t5000-tar-tree.sh @@ -10,7 +10,7 @@ commit id embedding: The contents of the repository is compared to the extracted tar archive. The repository contains simple text files, symlinks and a - binary file (/bin/sh). Only pathes shorter than 99 characters are + binary file (/bin/sh). Only paths shorter than 99 characters are used. git-tar-tree applies the commit date to every file in the archive it diff --git a/t/t5600-clone-fail-cleanup.sh b/t/t5600-clone-fail-cleanup.sh index 041be04f5..1776b377f 100755 --- a/t/t5600-clone-fail-cleanup.sh +++ b/t/t5600-clone-fail-cleanup.sh @@ -36,7 +36,7 @@ test_expect_success \ 'git-clone foo bar' test_expect_success \ - 'successfull clone must leave the directory' \ + 'successful clone must leave the directory' \ 'cd bar' test_done diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh index 46fcec50a..a2c4dc324 100755 --- a/t/t9101-git-svn-props.sh +++ b/t/t9101-git-svn-props.sh @@ -70,7 +70,7 @@ name='test svn:keywords ignoring' test_expect_success "$name" \ 'git checkout -b mybranch remotes/git-svn && echo Hi again >> kw.c && - git commit -a -m "test keywoards ignoring" && + git commit -a -m "test keywords ignoring" && git-svn set-tree remotes/git-svn..mybranch && git pull . remotes/git-svn' |