summaryrefslogtreecommitdiff
path: root/t/t3200-branch.sh
diff options
context:
space:
mode:
authorDavid Tran <unsignedzero@gmail.com>2014-03-18 18:54:05 +0000
committerJunio C Hamano <gitster@pobox.com>2014-03-19 12:55:57 -0700
commit512477b175288a429aaf4071dc9fe94f17f0e4ee (patch)
tree972f6fa1820571ca7bd2e257f020dd1e1caacb7e /t/t3200-branch.sh
parent5f95c9f850b19b368c43ae399cc831b17a26a5ac (diff)
downloadgit-512477b175288a429aaf4071dc9fe94f17f0e4ee.tar.gz
tests: use "env" to run commands with temporary env-var settingsdt/tests-with-env-not-subshell
Ordinarily, we would say "VAR=VAL command" to execute a tested command with environment variable(s) set only for that command. This however does not work if 'command' is a shell function (most notably 'test_must_fail'); the result of the assignment is retained and affects later commands. To avoid this, we used to assign and export environment variables and run such a test in a subshell, like so: ( VAR=VAL && export VAR && test_must_fail git command to be tested ) But with "env" utility, we should be able to say: test_must_fail env VAR=VAL git command to be tested which is much shorter and easier to read. Signed-off-by: David Tran <unsignedzero@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3200-branch.sh')
-rwxr-xr-xt/t3200-branch.sh12
1 files changed, 2 insertions, 10 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index fcdb867748..d45e95cfec 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -849,11 +849,7 @@ test_expect_success 'detect typo in branch name when using --edit-description' '
write_script editor <<-\EOF &&
echo "New contents" >"$1"
EOF
- (
- EDITOR=./editor &&
- export EDITOR &&
- test_must_fail git branch --edit-description no-such-branch
- )
+ test_must_fail env EDITOR=./editor git branch --edit-description no-such-branch
'
test_expect_success 'refuse --edit-description on unborn branch for now' '
@@ -861,11 +857,7 @@ test_expect_success 'refuse --edit-description on unborn branch for now' '
echo "New contents" >"$1"
EOF
git checkout --orphan unborn &&
- (
- EDITOR=./editor &&
- export EDITOR &&
- test_must_fail git branch --edit-description
- )
+ test_must_fail env EDITOR=./editor git branch --edit-description
'
test_expect_success '--merged catches invalid object names' '