mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-24 22:26:26 +02:00
Code

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

See e200783255

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Casey 2010-07-20 16:55:31 -05:00 committed by Junio C Hamano
parent bdcaa325b4
commit b1edaf669d
3 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
t/t2017-checkout-orphan.sh
View File

@ -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 &&
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
@ -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 &&
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 &&
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_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
'
@ -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 &&
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 &&
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' '

6
t/t3200-branch.sh
View File

@ -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 &&
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' '

6
t/t3301-notes.sh
View File

@ -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 &&
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
'