t1200: use --topo-order to keep the show-branch output stable.

Because a batch-oriented script creates many commits within a second
on a fast machine, show-branch output of the test results are unstable
without topo-order.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-11-10 18:27:44 -08:00
parent 6b209d4733
commit 4bc51db0fe

View File

@ -122,7 +122,7 @@ cat > show-branch.expect << EOF
++ [mybranch] Some work. ++ [mybranch] Some work.
EOF EOF
git show-branch master mybranch > show-branch.output git show-branch --topo-order master mybranch > show-branch.output
test_expect_success 'git show-branch' 'cmp show-branch.expect show-branch.output' test_expect_success 'git show-branch' 'cmp show-branch.expect show-branch.output'
git checkout mybranch git checkout mybranch
@ -145,7 +145,7 @@ cat > show-branch2.expect << EOF
++ [master] Merged "mybranch" changes. ++ [master] Merged "mybranch" changes.
EOF EOF
git show-branch master mybranch > show-branch2.output git show-branch --topo-order master mybranch > show-branch2.output
test_expect_success 'git show-branch' 'cmp show-branch2.expect show-branch2.output' test_expect_success 'git show-branch' 'cmp show-branch2.expect show-branch2.output'
# TODO: test git fetch # TODO: test git fetch