From: Junio C Hamano <junkio@cox.net>
Date: Fri, 11 Nov 2005 02:27:44 +0000 (-0800)
Subject: t1200: use --topo-order to keep the show-branch output stable.
X-Git-Tag: v0.99.9h^2~21^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=4bc51db0feb4a93a285d6333f206cad77c83ed57;p=git.git

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 35db799ed..d7562e974 100644
--- a/t/t1200-tutorial.sh
+++ b/t/t1200-tutorial.sh
@@ -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
@@ -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