undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t7406: fix misleading "rev-parse --max-count=1 HEAD"

Browse Source 
The test happened to use "rev-parse --max-count=1 HEAD" consistently
to prepare the expected output and the actual output, so the
comparison between them gave us a correct success/failure because
both output had irrelevant "--max-count=1" in it.

But that is not an excuse to keep it broken.  Replace it a more
meaningful construct "rev-parse --verify HEAD".

Noticed by Daniel Graña while working on his submodule tests.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2012-07-30 10:51:52 -07:00
parent 15ffb7cde4
commit ad6a599c0a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
t/t7406-submodule-update.sh
View File

@ -305,7 +305,7 @@ test_expect_success 'submodule update continues after checkout error' '
git submodule init && git submodule init &&
git commit -am "new_submodule" && git commit -am "new_submodule" &&
(cd submodule2 && (cd submodule2 &&
git rev-parse --max-count=1 HEAD > ../expect git rev-parse --verify HEAD >../expect
) && ) &&
(cd submodule && (cd submodule &&
test_commit "update_submodule" file test_commit "update_submodule" file
@ -322,7 +322,7 @@ test_expect_success 'submodule update continues after checkout error' '
git checkout HEAD^ && git checkout HEAD^ &&
test_must_fail git submodule update && test_must_fail git submodule update &&
(cd submodule2 && (cd submodule2 &&
git rev-parse --max-count=1 HEAD > ../actual git rev-parse --verify HEAD >../actual
) && ) &&
test_cmp expect actual test_cmp expect actual
) )
@ -351,7 +351,7 @@ test_expect_success 'submodule update continues after recursive checkout error'
test_commit "update_submodule_again_again" file test_commit "update_submodule_again_again" file
) && ) &&
(cd submodule2 && (cd submodule2 &&
git rev-parse --max-count=1 HEAD > ../expect && git rev-parse --verify HEAD >../expect &&
test_commit "update_submodule2_again" file test_commit "update_submodule2_again" file
) && ) &&
git add submodule && git add submodule &&
@ -366,7 +366,7 @@ test_expect_success 'submodule update continues after recursive checkout error'
) && ) &&
test_must_fail git submodule update --recursive && test_must_fail git submodule update --recursive &&
(cd submodule2 && (cd submodule2 &&
git rev-parse --max-count=1 HEAD > ../actual git rev-parse --verify HEAD >../actual
) && ) &&
test_cmp expect actual test_cmp expect actual
) )
@ -398,12 +398,12 @@ test_expect_success 'submodule update exit immediately in case of merge conflict
) && ) &&
git checkout HEAD^ && git checkout HEAD^ &&
(cd submodule2 && (cd submodule2 &&
git rev-parse --max-count=1 HEAD > ../expect git rev-parse --verify HEAD >../expect
) && ) &&
git config submodule.submodule.update merge && git config submodule.submodule.update merge &&
test_must_fail git submodule update && test_must_fail git submodule update &&
(cd submodule2 && (cd submodule2 &&
git rev-parse --max-count=1 HEAD > ../actual git rev-parse --verify HEAD >../actual
) && ) &&
test_cmp expect actual test_cmp expect actual
) )
@ -432,12 +432,12 @@ test_expect_success 'submodule update exit immediately after recursive rebase er
) && ) &&
git checkout HEAD^ && git checkout HEAD^ &&
(cd submodule2 && (cd submodule2 &&
git rev-parse --max-count=1 HEAD > ../expect git rev-parse --verify HEAD >../expect
) && ) &&
git config submodule.submodule.update rebase && git config submodule.submodule.update rebase &&
test_must_fail git submodule update && test_must_fail git submodule update &&
(cd submodule2 && (cd submodule2 &&
git rev-parse --max-count=1 HEAD > ../actual git rev-parse --verify HEAD >../actual
) && ) &&
test_cmp expect actual test_cmp expect actual
) )