projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "git-push: avoid falling back on pushing "matching" refs."
[git.git]
/
t
/
t1200-tutorial.sh
diff --git
a/t/t1200-tutorial.sh
b/t/t1200-tutorial.sh
old mode 100644
(file)
new mode 100755
(executable)
index
35db799
..
8ff5dd9
--- a/
t/t1200-tutorial.sh
+++ b/
t/t1200-tutorial.sh
@@
-118,11
+118,11
@@
cat > show-branch.expect << EOF
* [master] Merged "mybranch" changes.
! [mybranch] Some work.
--
* [master] Merged "mybranch" changes.
! [mybranch] Some work.
--
-
+
[master] Merged "mybranch" changes.
-
+
+ [mybranch] Some work.
+
-
[master] Merged "mybranch" changes.
+
*
+ [mybranch] Some work.
EOF
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
test_expect_success 'git show-branch' 'cmp show-branch.expect show-branch.output'
git checkout mybranch
@@
-142,10
+142,10
@@
cat > show-branch2.expect << EOF
! [master] Merged "mybranch" changes.
* [mybranch] Merged "mybranch" changes.
--
! [master] Merged "mybranch" changes.
* [mybranch] Merged "mybranch" changes.
--
-
++
[master] Merged "mybranch" changes.
+
--
[master] Merged "mybranch" changes.
EOF
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
test_expect_success 'git show-branch' 'cmp show-branch2.expect show-branch2.output'
# TODO: test git fetch