Merge branch 'jk/checkout-from-tree' into maint

diff --git a/t/lib-credential.sh b/t/lib-credential.sh
index 9e7d7962b0678dceefb93e3706b742cbfdc5b45e..d8e41f7ddd155b9f2861f55ab97943fed28968e7 100755 (executable)
--- a/t/lib-credential.sh
+++ b/t/lib-credential.sh
@@ -278,12 +278,10 @@ helper_test_timeout() {
        '
 }
 
-cat >askpass <<\EOF
-#!/bin/sh
+write_script askpass <<\EOF
 echo >&2 askpass: $*
 what=$(echo $1 | cut -d" " -f1 | tr A-Z a-z | tr -cd a-z)
 echo "askpass-$what"
 EOF
-chmod +x askpass
 GIT_ASKPASS="$PWD/askpass"
 export GIT_ASKPASS