diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-31 16:30:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-31 16:30:40 -0700 |
| commit | fa73d354689aa577d564b03d22f87c34b6288a78 (patch) | |
| tree | d9b0fafb6bd690397265aae2d549489546dfe004 /t/t3200-branch.sh | |
| parent | 96e67c86f817b4fbd492b12f57dae4bd821571ba (diff) | |
| parent | 512477b175288a429aaf4071dc9fe94f17f0e4ee (diff) | |
| download | git-fa73d354689aa577d564b03d22f87c34b6288a78.tar.gz git-fa73d354689aa577d564b03d22f87c34b6288a78.tar.xz | |
Merge branch 'dt/tests-with-env-not-subshell'
* dt/tests-with-env-not-subshell:
tests: use "env" to run commands with temporary env-var settings
Diffstat (limited to 't/t3200-branch.sh')
| -rwxr-xr-x | t/t3200-branch.sh | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 83037b1cd..ac31b711f 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -859,11 +859,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' ' @@ -871,11 +867,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' ' |