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>

diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh
index 35db799edff628f4671815fec58f8176c2a7cd77..d7562e974877dca68fe3db5725aac70be1f474aa 100644 (file)
--- a/t/t1200-tutorial.sh
+++ b/t/t1200-tutorial.sh
@@ -122,7 +122,7 @@ cat > show-branch.expect << EOF
 ++ [mybranch] Some work.
 EOF
 
 ++ [mybranch] Some work.
 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'
 
 git checkout mybranch
 test_expect_success 'git show-branch' 'cmp show-branch.expect show-branch.output'
 
 git checkout mybranch


@@ -145,7 +145,7 @@ cat > show-branch2.expect << EOF
 ++ [master] Merged "mybranch" changes.
 EOF
 
 ++ [master] Merged "mybranch" changes.
 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'
 
 # TODO: test git fetch
 test_expect_success 'git show-branch' 'cmp show-branch2.expect show-branch2.output'
 
 # TODO: test git fetch