Skip to content

Commit

Permalink
t1200: use --topo-order to keep the show-branch output stable.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Nov 11, 2005
1 parent 6b209d4 commit 4bc51db
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions t/t1200-tutorial.sh
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ cat > show-branch.expect << 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
Expand All @@ -145,7 +145,7 @@ cat > show-branch2.expect << 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
Expand Down

0 comments on commit 4bc51db

Please sign in to comment.