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

* jc/no-need-for-env-in-sh-scripts:
  *.sh: drop useless use of "env"
This commit is contained in:
Junio C Hamano 2014-03-18 13:51:07 -07:00
commit 1c18a14b63
2 changed files with 2 additions and 2 deletions

View File

@ -148,7 +148,7 @@ test_expect_success 'GIT_PREFIX for built-ins' '
( (
cd dir && cd dir &&
printf "change" >two && printf "change" >two &&
env GIT_EXTERNAL_DIFF=./diff git diff >../actual GIT_EXTERNAL_DIFF=./diff git diff >../actual
git checkout -- two git checkout -- two
) && ) &&
test_cmp expect actual test_cmp expect actual

View File

@ -409,7 +409,7 @@ test_expect_success $PREREQ 'Valid In-Reply-To when prompting' '
(echo "From Example <from@example.com>" (echo "From Example <from@example.com>"
echo "To Example <to@example.com>" echo "To Example <to@example.com>"
echo "" echo ""
) | env GIT_SEND_EMAIL_NOTTY=1 git send-email \ ) | GIT_SEND_EMAIL_NOTTY=1 git send-email \
--smtp-server="$(pwd)/fake.sendmail" \ --smtp-server="$(pwd)/fake.sendmail" \
$patches 2>errors && $patches 2>errors &&
! grep "^In-Reply-To: < *>" msgtxt1 ! grep "^In-Reply-To: < *>" msgtxt1