Merge branch 'jc/no-need-for-env-in-sh-scripts'

gitster · gitster · commit 1c18a14b637a · 2014-03-18T13:51:07.000-07:00
* jc/no-need-for-env-in-sh-scripts:
  *.sh: drop useless use of "env"
diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh
@@ -148,7 +148,7 @@ test_expect_success 'GIT_PREFIX for built-ins' '
 	(
 		cd dir &&
 		printf "change" >two &&
-		env GIT_EXTERNAL_DIFF=./diff git diff >../actual
+		GIT_EXTERNAL_DIFF=./diff git diff >../actual
 		git checkout -- two
 	) &&
 	test_cmp expect actual
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
@@ -409,7 +409,7 @@ test_expect_success $PREREQ 'Valid In-Reply-To when prompting' '
 	(echo "From Example <from@example.com>"
 	 echo "To Example <to@example.com>"
 	 echo ""
-	) | env GIT_SEND_EMAIL_NOTTY=1 git send-email \
+	) | GIT_SEND_EMAIL_NOTTY=1 git send-email \
 		--smtp-server="$(pwd)/fake.sendmail" \
 		$patches 2>errors &&
 	! grep "^In-Reply-To: < *>" msgtxt1

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ test_expect_success 'GIT_PREFIX for built-ins' '`
`148`	`148`	`(`
`149`	`149`	`cd dir &&`
`150`	`150`	`printf "change" >two &&`
`151`		`- env GIT_EXTERNAL_DIFF=./diff git diff >../actual`
	`151`	`+ GIT_EXTERNAL_DIFF=./diff git diff >../actual`
`152`	`152`	`git checkout -- two`
`153`	`153`	`) &&`
`154`	`154`	`test_cmp expect actual`