diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-10 18:27:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-11 10:52:39 -0800 |
| commit | 4bc51db0feb4a93a285d6333f206cad77c83ed57 (patch) | |
| tree | 77c8876405eaedadeb309558ecf44c447f748e8d /t/t1200-tutorial.sh | |
| parent | 6b209d473378cc25708ab9839d0edd493afc1e8f (diff) | |
| download | git-4bc51db0feb4a93a285d6333f206cad77c83ed57.tar.gz | |
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>
Diffstat (limited to 't/t1200-tutorial.sh')
| -rw-r--r-- | t/t1200-tutorial.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh index 35db799edf..d7562e9748 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 |