Merge branch 'sp/complete-ext-alias'

diff --git a/t/lib-credential.sh b/t/lib-credential.sh
index 3c43ff11b305c5d533323c1ed9520ac52d0cfbe3..9e7d7962b0678dceefb93e3706b742cbfdc5b45e 100755 (executable)
--- a/t/lib-credential.sh
+++ b/t/lib-credential.sh
@@ -18,10 +18,6 @@ check() {
                cat stderr &&
                false
        fi &&
-       if test_have_prereq MINGW
-       then
-               dos2unix -q stderr
-       fi &&
        test_cmp expect-stdout stdout &&
        test_cmp expect-stderr stderr
 }
@@ -285,7 +281,7 @@ helper_test_timeout() {
 cat >askpass <<\EOF
 #!/bin/sh
 echo >&2 askpass: $*
-what=`echo $1 | cut -d" " -f1 | tr A-Z a-z | tr -cd a-z`
+what=$(echo $1 | cut -d" " -f1 | tr A-Z a-z | tr -cd a-z)
 echo "askpass-$what"
 EOF
 chmod +x askpass