Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-12 19:47:37 +0300
committerJunio C Hamano <gitster@pobox.com>2016-08-12 19:47:37 +0300
commite6b8f80653063cd41903c599ec9ca83be3d3afa5 (patch)
tree52d1e93fe3edc581275f92f98981c3103471af58 /t/t7001-mv.sh
parent2c44b7a53bf49430f231a71668d2a1c4ea9f5591 (diff)
parent2e3a16b279a9df2e498187871c67e623e12bc8a4 (diff)
Merge branch 'vs/typofix'
* vs/typofix: Spelling fixes
Diffstat (limited to 't/t7001-mv.sh')
-rwxr-xr-xt/t7001-mv.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 4a2570ed95..e365d1ff77 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -292,8 +292,8 @@ test_expect_success 'setup submodule' '
echo content >file &&
git add file &&
git commit -m "added sub and file" &&
- mkdir -p deep/directory/hierachy &&
- git submodule add ./. deep/directory/hierachy/sub &&
+ mkdir -p deep/directory/hierarchy &&
+ git submodule add ./. deep/directory/hierarchy/sub &&
git commit -m "added another submodule" &&
git branch submodule
'
@@ -485,8 +485,8 @@ test_expect_success 'moving a submodule in nested directories' '
# git status would fail if the update of linking git dir to
# work dir of the submodule failed.
git status &&
- git config -f ../.gitmodules submodule.deep/directory/hierachy/sub.path >../actual &&
- echo "directory/hierachy/sub" >../expect
+ git config -f ../.gitmodules submodule.deep/directory/hierarchy/sub.path >../actual &&
+ echo "directory/hierarchy/sub" >../expect
) &&
test_cmp actual expect
'