Merge branch 'md/url-parse-harden'

diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index 1f462204eaf878694be8045313097155480cec57..0276d14a0ba66d4af6ad7af14c6b7e98305a1b84 100755 (executable)
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -93,7 +93,7 @@ test_expect_success 'No extra GIT_* on alias scripts' '
                sed -n \
                        -e "/^GIT_PREFIX=/d" \
                        -e "/^GIT_TEXTDOMAINDIR=/d" \
-                       -e "/^GIT_TR2_PARENT/d" \
+                       -e "/^GIT_TRACE2_PARENT/d" \
                        -e "/^GIT_/s/=.*//p" |
                sort
        EOF
@@ -175,7 +175,7 @@ test_expect_success 'reinit' '
 test_expect_success 'init with --template' '
        mkdir template-source &&
        echo content >template-source/file &&
-       git init --template=../template-source template-custom &&
+       git init --template=template-source template-custom &&
        test_cmp template-source/file template-custom/.git/file
 '