projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into lt/apply
[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
d7562e9
..
c7db20e
--- a/
t/t1200-tutorial.sh
+++ b/
t/t1200-tutorial.sh
@@
-49,7
+49,7
@@
test_expect_success 'git diff HEAD' 'cmp diff.expect diff.output'
#test_expect_success 'git-read-tree --reset HEAD' "git-read-tree --reset HEAD ; test \"hello: needs update\" = \"$(git-update-index --refresh)\""
cat > whatchanged.expect << EOF
#test_expect_success 'git-read-tree --reset HEAD' "git-read-tree --reset HEAD ; test \"hello: needs update\" = \"$(git-update-index --refresh)\""
cat > whatchanged.expect << EOF
-diff-tree VARIABLE (from root)
+commit VARIABLE
Author: VARIABLE
Date: VARIABLE
Author: VARIABLE
Date: VARIABLE
@@
-72,7
+72,7
@@
index 0000000..557db03
EOF
git-whatchanged -p --root | \
EOF
git-whatchanged -p --root | \
- sed -e "1s/^\(.\{
10
\}\).\{40\}/\1VARIABLE/" \
+ sed -e "1s/^\(.\{
7
\}\).\{40\}/\1VARIABLE/" \
-e "2,3s/^\(.\{8\}\).*$/\1VARIABLE/" \
> whatchanged.output
test_expect_success 'git-whatchanged -p --root' 'cmp whatchanged.expect whatchanged.output'
-e "2,3s/^\(.\{8\}\).*$/\1VARIABLE/" \
> whatchanged.output
test_expect_success 'git-whatchanged -p --root' 'cmp whatchanged.expect whatchanged.output'
@@
-95,13
+95,13
@@
test_expect_success 'git branch' 'cmp branch.expect branch.output'
git checkout mybranch
echo "Work, work, work" >>hello
git checkout mybranch
echo "Work, work, work" >>hello
-git commit -m 'Some work.' hello
+git commit -m 'Some work.'
-i
hello
git checkout master
echo "Play, play, play" >>hello
echo "Lots of fun" >>example
git checkout master
echo "Play, play, play" >>hello
echo "Lots of fun" >>example
-git commit -m 'Some fun.' hello example
+git commit -m 'Some fun.'
-i
hello example
test_expect_failure 'git resolve now fails' 'git resolve HEAD mybranch "Merge work in mybranch"'
test_expect_failure 'git resolve now fails' 'git resolve HEAD mybranch "Merge work in mybranch"'
@@
-112,14
+112,16
@@
Play, play, play
Work, work, work
EOF
Work, work, work
EOF
-git commit -m 'Merged "mybranch" changes.' hello
+git commit -m 'Merged "mybranch" changes.' -i hello
+
+test_done
cat > show-branch.expect << EOF
* [master] Merged "mybranch" changes.
! [mybranch] Some work.
--
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.
EOF
git show-branch --topo-order master mybranch > show-branch.output
EOF
git show-branch --topo-order master mybranch > show-branch.output
@@
-128,7
+130,7
@@
test_expect_success 'git show-branch' 'cmp show-branch.expect show-branch.output
git checkout mybranch
cat > resolve.expect << EOF
git checkout mybranch
cat > resolve.expect << EOF
-Updating from VARIABLE to VARIABLE
.
+Updating from VARIABLE to VARIABLE
example | 1 +
hello | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
example | 1 +
hello | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
@@
-142,7
+144,7
@@
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
git show-branch --topo-order master mybranch > show-branch2.output
EOF
git show-branch --topo-order master mybranch > show-branch2.output