Skip to content

Commit 4bc51db

Browse files
author
Junio C Hamano
committed
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>
1 parent 6b209d4 commit 4bc51db

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

t/t1200-tutorial.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ cat > show-branch.expect << EOF
122122
++ [mybranch] Some work.
123123
EOF
124124

125-
git show-branch master mybranch > show-branch.output
125+
git show-branch --topo-order master mybranch > show-branch.output
126126
test_expect_success 'git show-branch' 'cmp show-branch.expect show-branch.output'
127127

128128
git checkout mybranch
@@ -145,7 +145,7 @@ cat > show-branch2.expect << EOF
145145
++ [master] Merged "mybranch" changes.
146146
EOF
147147

148-
git show-branch master mybranch > show-branch2.output
148+
git show-branch --topo-order master mybranch > show-branch2.output
149149
test_expect_success 'git show-branch' 'cmp show-branch2.expect show-branch2.output'
150150

151151
# TODO: test git fetch

0 commit comments

Comments
 (0)