Merge branch 'nd/clear-gitenv-upon-use-of-alias'

Hotfix for a test breakage made between 2.7 and 'master'.

* nd/clear-gitenv-upon-use-of-alias:
  t0001: fix GIT_* environment variable check under --valgrind
This commit is contained in:
Junio C Hamano 2016-03-04 13:46:44 -08:00
commit 28ab768afa

View File

@ -88,19 +88,17 @@ test_expect_success 'plain nested in bare through aliased command' '
' '
test_expect_success 'No extra GIT_* on alias scripts' ' test_expect_success 'No extra GIT_* on alias scripts' '
( write_script script <<-\EOF &&
env | sed -ne "/^GIT_/s/=.*//p" && env |
echo GIT_PREFIX && # setup.c sed -n \
echo GIT_TEXTDOMAINDIR # wrapper-for-bin.sh -e "/^GIT_PREFIX=/d" \
) | sort | uniq >expected && -e "/^GIT_TEXTDOMAINDIR=/d" \
cat <<-\EOF >script && -e "/^GIT_/s/=.*//p" |
#!/bin/sh sort
env | sed -ne "/^GIT_/s/=.*//p" | sort >actual
exit 0
EOF EOF
chmod 755 script && ./script >expected &&
git config alias.script \!./script && git config alias.script \!./script &&
( mkdir sub && cd sub && git script ) && ( mkdir sub && cd sub && git script >../actual ) &&
test_cmp expected actual test_cmp expected actual
' '