t/: work around one-shot variable assignment with test_must_fail

See e2007832552ccea9befed9003580c494f09e666e

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t2017-checkout-orphan.sh b/t/t2017-checkout-orphan.sh
index be88d4b5ee86b75eb0e5654404064f712192d0a9..81cb393a95a3e3b0a172b6016d32cade8dbafdb4 100755 (executable)
--- a/t/t2017-checkout-orphan.sh
+++ b/t/t2017-checkout-orphan.sh
@@ -69,7 +69,11 @@ test_expect_success '--orphan makes reflog by default' '
        git config --unset core.logAllRefUpdates &&
        git checkout --orphan delta &&
        ! test -f .git/logs/refs/heads/delta &&
        git config --unset core.logAllRefUpdates &&
        git checkout --orphan delta &&
        ! test -f .git/logs/refs/heads/delta &&

-       test_must_fail PAGER= git reflog show delta &&
+       (
+               PAGER= &&
+               export PAGER &&
+               test_must_fail git reflog show delta
+       ) &&

        git commit -m Delta &&
        test -f .git/logs/refs/heads/delta &&
        PAGER= git reflog show delta
        git commit -m Delta &&
        test -f .git/logs/refs/heads/delta &&
        PAGER= git reflog show delta


@@ -80,17 +84,29 @@ test_expect_success '--orphan does not make reflog when core.logAllRefUpdates =
        git config core.logAllRefUpdates false &&
        git checkout --orphan epsilon &&
        ! test -f .git/logs/refs/heads/epsilon &&
        git config core.logAllRefUpdates false &&
        git checkout --orphan epsilon &&
        ! test -f .git/logs/refs/heads/epsilon &&

-       test_must_fail PAGER= git reflog show epsilon &&
+       (
+               PAGER= &&
+               export PAGER &&
+               test_must_fail git reflog show epsilon
+       ) &&

        git commit -m Epsilon &&
        ! test -f .git/logs/refs/heads/epsilon &&
        git commit -m Epsilon &&
        ! test -f .git/logs/refs/heads/epsilon &&

-       test_must_fail PAGER= git reflog show epsilon
+       (
+               PAGER= &&
+               export PAGER &&
+               test_must_fail git reflog show epsilon
+       )

 '
 
 test_expect_success '--orphan with -l makes reflog when core.logAllRefUpdates = false' '
        git checkout master &&
        git checkout -l --orphan zeta &&
        test -f .git/logs/refs/heads/zeta &&
 '
 
 test_expect_success '--orphan with -l makes reflog when core.logAllRefUpdates = false' '
        git checkout master &&
        git checkout -l --orphan zeta &&
        test -f .git/logs/refs/heads/zeta &&

-       test_must_fail PAGER= git reflog show zeta &&
+       (
+               PAGER= &&
+               export PAGER &&
+               test_must_fail git reflog show zeta
+       ) &&

        git commit -m Zeta &&
        PAGER= git reflog show zeta
 '
        git commit -m Zeta &&
        PAGER= git reflog show zeta
 '


@@ -99,10 +115,18 @@ test_expect_success 'giving up --orphan not committed when -l and core.logAllRef
        git checkout master &&
        git checkout -l --orphan eta &&
        test -f .git/logs/refs/heads/eta &&
        git checkout master &&
        git checkout -l --orphan eta &&
        test -f .git/logs/refs/heads/eta &&

-       test_must_fail PAGER= git reflog show eta &&
+       (
+               PAGER= &&
+               export PAGER &&
+               test_must_fail git reflog show eta
+       ) &&

        git checkout master &&
        ! test -f .git/logs/refs/heads/eta &&
        git checkout master &&
        ! test -f .git/logs/refs/heads/eta &&

-       test_must_fail PAGER= git reflog show eta
+       (
+               PAGER= &&
+               export PAGER &&
+               test_must_fail git reflog show eta
+       )

 '
 
 test_expect_success '--orphan is rejected with an existing name' '
 '
 
 test_expect_success '--orphan is rejected with an existing name' '

diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 859b99abf1cc62c966322fcfc552c0a7eb7356df..bf7747dc331995fe377d4943f450ea295375565e 100755 (executable)
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -237,7 +237,11 @@ test_expect_success 'checkout -b does not make reflog when core.logAllRefUpdates
        git config core.logAllRefUpdates false &&
        git checkout -b beta &&
        ! test -f .git/logs/refs/heads/beta &&
        git config core.logAllRefUpdates false &&
        git checkout -b beta &&
        ! test -f .git/logs/refs/heads/beta &&

-       test_must_fail PAGER= git reflog show beta
+       (
+               PAGER= &&
+               export PAGER &&
+               test_must_fail git reflog show beta
+       )

 '
 
 test_expect_success 'checkout -b with -l makes reflog when core.logAllRefUpdates = false' '
 '
 
 test_expect_success 'checkout -b with -l makes reflog when core.logAllRefUpdates = false' '

diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
index 2d67a40fc16385b8bee37968f4058b094a174a98..1d82f79ee07e8f9317bc23c49cdf941af36ce3ff 100755 (executable)
--- a/t/t3301-notes.sh
+++ b/t/t3301-notes.sh
@@ -693,7 +693,11 @@ test_expect_success 'create note from non-existing note with "git notes add -c"
        git add a10 &&
        test_tick &&
        git commit -m 10th &&
        git add a10 &&
        test_tick &&
        git commit -m 10th &&

-       test_must_fail MSG="yet another note" git notes add -c deadbeef &&
+       (
+               MSG="yet another note" &&
+               export MSG &&
+               test_must_fail git notes add -c deadbeef
+       ) &&

        test_must_fail git notes list HEAD
 '
 
        test_must_fail git notes list HEAD
 '