Merge branch 'js/regexec-buf' into maint

diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 4a2570ed959410ca34503c6260141f10debd752b..e365d1ff77ee30e0f40b8f01c7e70ebc74e97901 100755 (executable)
--- 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
 '