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>
Junio C Hamano committed
Nov 10, 2005 at 18:27 UTC
4bc51db0feb4a93a285d6333f206cad77c83ed57
1 file changed
+2
-2
t/t1200-tutorial.sh
+2
-2
@@ -122,7 +122,7 @@ cat > show-branch.expect << EOF
122
++ [mybranch] Some work.
123
EOF
124
125
-git show-branch master mybranch > show-branch.output
125
+git show-branch --topo-order master mybranch > show-branch.output
126
test_expect_success 'git show-branch' 'cmp show-branch.expect show-branch.output'
127
128
git checkout mybranch
@@ -145,7 +145,7 @@ cat > show-branch2.expect << EOF
145
++ [master] Merged "mybranch" changes.
146
EOF
147
148
-git show-branch master mybranch > show-branch2.output
148
+git show-branch --topo-order master mybranch > show-branch2.output
149
test_expect_success 'git show-branch' 'cmp show-branch2.expect show-branch2.output'
150
151
# TODO: test git fetch