aboutsummaryrefslogtreecommitdiff
path: root/t/t1200-tutorial.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-11 22:37:38 -0800
committerJunio C Hamano <junkio@cox.net>2005-11-11 22:37:38 -0800
commitf7a2eb735982e921ae4379f1dcf5f7a023610393 (patch)
tree26fe2c59a8fed68a531e7b855a495f52198162a2 /t/t1200-tutorial.sh
parent23ea3e201cea0deea909569e08e950a9ec2345f7 (diff)
parent7765e7ebda7e273bca34e87110be899447068b58 (diff)
downloadgit-1.0rc1.tar.gz
git-1.0rc1.tar.xz
GIT 0.99.9hv1.0rc1v0.99.9h
This is GIT 1.0-rc1 in disguise. It is plausible that relatively new parts of the system still need tweaking and fixing, but that is why it is not 1.0 but rc ;-). Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t1200-tutorial.sh')
-rw-r--r--t/t1200-tutorial.sh4
1 files changed, 2 insertions, 2 deletions
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