X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Ft1200-tutorial.sh;h=d7562e974877dca68fe3db5725aac70be1f474aa;hb=e6c310fd0d7384973efc6b1d5999a5e8a5b2f3bd;hp=35db799edff628f4671815fec58f8176c2a7cd77;hpb=e634aec752642dcf86c3fc82025e43381d6768c2;p=git.git diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh old mode 100644 new mode 100755 index 35db799e..d7562e97 --- 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