diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-25 20:59:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-25 20:59:20 (GMT) |
| commit | 023ff4cdf5793437313f481b4ef5b1ec247f2301 (patch) | |
| tree | fe222b4b3edeb442b7873d89d03556a1e11c1274 /t/t6040-tracking-info.sh | |
| parent | 9c9b961d7eb15fb583a2a812088713a68a85f1c0 (diff) | |
| parent | 08a8ac88d868f3206e8faf0df2502ebc18925c33 (diff) | |
| download | git-023ff4cdf5793437313f481b4ef5b1ec247f2301.zip git-023ff4cdf5793437313f481b4ef5b1ec247f2301.tar.gz git-023ff4cdf5793437313f481b4ef5b1ec247f2301.tar.bz2 | |
Merge branch 'ab/test-env'
Many GIT_TEST_* environment variables control various aspects of
how our tests are run, but a few followed "non-empty is true, empty
or unset is false" while others followed the usual "there are a few
ways to spell true, like yes, on, etc., and also ways to spell
false, like no, off, etc." convention.
* ab/test-env:
env--helper: mark a file-local symbol as static
tests: make GIT_TEST_FAIL_PREREQS a boolean
tests: replace test_tristate with "git env--helper"
tests README: re-flow a previously changed paragraph
tests: make GIT_TEST_GETTEXT_POISON a boolean
t6040 test: stop using global "script" variable
config.c: refactor die_bad_number() to not call gettext() early
env--helper: new undocumented builtin wrapping git_env_*()
config tests: simplify include cycle test
Diffstat (limited to 't/t6040-tracking-info.sh')
| -rwxr-xr-x | t/t6040-tracking-info.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh index febf63f..ad1922b 100755 --- a/t/t6040-tracking-info.sh +++ b/t/t6040-tracking-info.sh @@ -38,7 +38,7 @@ test_expect_success setup ' advance h ' -script='s/^..\(b.\) *[0-9a-f]* \(.*\)$/\1 \2/p' +t6040_script='s/^..\(b.\) *[0-9a-f]* \(.*\)$/\1 \2/p' cat >expect <<\EOF b1 [ahead 1, behind 1] d b2 [ahead 1, behind 1] d @@ -53,7 +53,7 @@ test_expect_success 'branch -v' ' cd test && git branch -v ) | - sed -n -e "$script" >actual && + sed -n -e "$t6040_script" >actual && test_i18ncmp expect actual ' @@ -71,7 +71,7 @@ test_expect_success 'branch -vv' ' cd test && git branch -vv ) | - sed -n -e "$script" >actual && + sed -n -e "$t6040_script" >actual && test_i18ncmp expect actual ' |