Merge branch 'bw/use-write-script-in-tests'

gitster · gitster · commit 9342f49738a6 · 2014-10-08T13:05:29.000-07:00
* bw/use-write-script-in-tests:
  t/lib-credential: use write_script
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -278,12 +278,10 @@ helper_test_timeout() {`
`278`	`278`	`'`
`279`	`279`	`}`
`280`	`280`
`281`		`-cat >askpass <<\EOF`
`282`		`-#!/bin/sh`
	`281`	`+write_script askpass <<\EOF`
`283`	`282`	`echo >&2 askpass: $*`
`284`	`283`	`what=$(echo $1 \| cut -d" " -f1 \| tr A-Z a-z \| tr -cd a-z)`
`285`	`284`	`echo "askpass-$what"`
`286`	`285`	`EOF`
`287`		`-chmod +x askpass`
`288`	`286`	`GIT_ASKPASS="$PWD/askpass"`
`289`	`287`	`export GIT_ASKPASS`