Merge branch 'rs/obsd-getcwd-workaround' into next

diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index 16952e44fcfd705e115b81099bdbff809ff1520d..aa74eb8f0d5dfb4f228b1e8c7b9dbbc0b88adb4d 100755 (executable)
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -244,7 +244,7 @@ test_expect_success 'setup and absorb a submodule' '
        test_cmp expect out
 '
 
-test_expect_success 'describe chokes on severly broken submodules' '
+test_expect_success 'describe chokes on severely broken submodules' '
        mv .git/modules/sub1/ .git/modules/sub_moved &&
        test_must_fail git describe --dirty
 '