Skip to content

Commit

Permalink
Merge branch 'jc/no-need-for-env-in-sh-scripts'
Browse files Browse the repository at this point in the history
* jc/no-need-for-env-in-sh-scripts:
  *.sh: drop useless use of "env"
  • Loading branch information
Junio C Hamano committed Mar 18, 2014
2 parents 006f678 + 6eca18c commit 1c18a14
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion t/t1020-subdirectory.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion t/t9001-send-email.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1c18a14

Please sign in to comment.