Merge branch 'ab/i18n-basic'

diff --git a/t/t1510-repo-setup.sh b/t/t1510-repo-setup.sh
index dcc0f86bd8ff7f05733297c2c15acf29f4f590f3..ec50a9ad70450cb80074a6002c66bf2efb8e7833 100755 (executable)
--- a/t/t1510-repo-setup.sh
+++ b/t/t1510-repo-setup.sh
@@ -57,7 +57,7 @@ test_repo () {
                        export GIT_WORK_TREE
                fi &&
                rm -f trace &&
-               GIT_TRACE="$(pwd)/trace" git symbolic-ref HEAD >/dev/null &&
+               GIT_TRACE_SETUP="$(pwd)/trace" git symbolic-ref HEAD >/dev/null &&
                grep '^setup: ' trace >result &&
                test_cmp expected result
        )
@@ -739,7 +739,7 @@ test_expect_success '#28: core.worktree and core.bare conflict (gitfile case)' '
        grep "core.bare and core.worktree" message
 '
 
-# Case #29: GIT_WORK_TREE(+core.worktree) overries core.bare (gitfile case).
+# Case #29: GIT_WORK_TREE(+core.worktree) overrides core.bare (gitfile case).
 test_expect_success '#29: setup' '
        setup_repo 29 non-existent gitfile true &&
        mkdir -p 29/sub/sub 29/wt/sub