mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 19:13:58 +01:00
Code

tests: correct "does reflog exist?" tests

Browse Source 
These two tests weren't about how "git reflog show <branch>" exits when
there is no reflog, but were about "checkout" and "branch" create or not
create reflog when creating a new <branch>.  Update the tests to check
what we are interested in, using "git rev-parse --verify".

Also lose tests based on "test -f .git/logs/refs/heads/<branch>" from
nearby, to avoid exposing this particular implementation detail
unnecessarily.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2010-07-21 12:47:48 -07:00
parent b1edaf669d
commit 6e6842e36f
2 changed files with 11 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,65 +68,34 @@ test_expect_success '--orphan makes reflog by default' '
git checkout master &&
git config --unset core.logAllRefUpdates &&
git checkout --orphan delta &&
! test -f .git/logs/refs/heads/delta &&
(
PAGER= &&
export PAGER &&
test_must_fail git reflog show delta
) &&
test_must_fail git rev-parse --verify delta@{0} &&
git commit -m Delta &&
test -f .git/logs/refs/heads/delta &&
PAGER= git reflog show delta
git rev-parse --verify delta@{0}
'
test_expect_success '--orphan does not make reflog when core.logAllRefUpdates = false' '
git checkout master &&
git config core.logAllRefUpdates false &&
git checkout --orphan epsilon &&
! test -f .git/logs/refs/heads/epsilon &&
(
PAGER= &&
export PAGER &&
test_must_fail git reflog show epsilon
) &&
test_must_fail git rev-parse --verify epsilon@{0} &&
git commit -m Epsilon &&
! test -f .git/logs/refs/heads/epsilon &&
(
PAGER= &&
export PAGER &&
test_must_fail git reflog show epsilon
)
test_must_fail git rev-parse --verify epsilon@{0}
'
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 &&
(
PAGER= &&
export PAGER &&
test_must_fail git reflog show zeta
) &&
test_must_fail git rev-parse --verify zeta@{0} &&
git commit -m Zeta &&
PAGER= git reflog show zeta
git rev-parse --verify zeta@{0}
'
test_expect_success 'giving up --orphan not committed when -l and core.logAllRefUpdates = false deletes reflog' '
git checkout master &&
git checkout -l --orphan eta &&
test -f .git/logs/refs/heads/eta &&
(
PAGER= &&
export PAGER &&
test_must_fail git reflog show eta
) &&
test_must_fail git rev-parse --verify eta@{0} &&
git checkout master &&
! test -f .git/logs/refs/heads/eta &&
(
PAGER= &&
export PAGER &&
test_must_fail git reflog show eta
)
test_must_fail git rev-parse --verify eta@{0}
'
test_expect_success '--orphan is rejected with an existing name' '

13
t/t3200-branch.sh
View File

@ -228,28 +228,21 @@ test_expect_success 'checkout -b makes reflog by default' '
git checkout master &&
git config --unset core.logAllRefUpdates &&
git checkout -b alpha &&
test -f .git/logs/refs/heads/alpha &&
PAGER= git reflog show alpha
git rev-parse --verify alpha@{0}
'
test_expect_success 'checkout -b does not make reflog when core.logAllRefUpdates = false' '
git checkout master &&
git config core.logAllRefUpdates false &&
git checkout -b beta &&
! test -f .git/logs/refs/heads/beta &&
(
PAGER= &&
export PAGER &&
test_must_fail git reflog show beta
)
test_must_fail git rev-parse --verify beta@{0}
'
test_expect_success 'checkout -b with -l makes reflog when core.logAllRefUpdates = false' '
git checkout master &&
git checkout -lb gamma &&
git config --unset core.logAllRefUpdates &&
test -f .git/logs/refs/heads/gamma &&
PAGER= git reflog show gamma
git rev-parse --verify gamma@{0}
'
test_expect_success 'avoid ambiguous track' '