show-branch: make the current branch and merge commits stand out.
[git/git.git] / t / t1200-tutorial.sh
CommitLineData
2ae6c706
JS
1#!/bin/sh
2#
3# Copyright (c) 2005 Johannes Schindelin
4#
5
6test_description='Test git-rev-parse with different parent options'
7
8. ./test-lib.sh
9
10echo "Hello World" > hello
11echo "Silly example" > example
12
13git-update-index --add hello example
14
15test_expect_success 'blob' "test blob = \"$(git-cat-file -t 557db03)\""
16
17test_expect_success 'blob 557db03' "test \"Hello World\" = \"$(git-cat-file blob 557db03)\""
18
19echo "It's a new day for git" >>hello
20cat > diff.expect << EOF
21diff --git a/hello b/hello
22index 557db03..263414f 100644
23--- a/hello
24+++ b/hello
25@@ -1 +1,2 @@
26 Hello World
27+It's a new day for git
28EOF
29git-diff-files -p > diff.output
30test_expect_success 'git-diff-files -p' 'cmp diff.expect diff.output'
31git diff > diff.output
32test_expect_success 'git diff' 'cmp diff.expect diff.output'
33
34tree=$(git-write-tree 2>/dev/null)
35
36test_expect_success 'tree' "test 8988da15d077d4829fc51d8544c097def6644dbb = $tree"
37
38output="$(echo "Initial commit" | git-commit-tree $(git-write-tree) 2>&1 > .git/refs/heads/master)"
39
40test_expect_success 'commit' "test 'Committing initial tree 8988da15d077d4829fc51d8544c097def6644dbb' = \"$output\""
41
42git-diff-index -p HEAD > diff.output
43test_expect_success 'git-diff-index -p HEAD' 'cmp diff.expect diff.output'
44
45git diff HEAD > diff.output
46test_expect_success 'git diff HEAD' 'cmp diff.expect diff.output'
47
48#rm hello
49#test_expect_success 'git-read-tree --reset HEAD' "git-read-tree --reset HEAD ; test \"hello: needs update\" = \"$(git-update-index --refresh)\""
50
51cat > whatchanged.expect << EOF
52diff-tree VARIABLE (from root)
53Author: VARIABLE
54Date: VARIABLE
55
56 Initial commit
57
58diff --git a/example b/example
59new file mode 100644
60index 0000000..f24c74a
61--- /dev/null
62+++ b/example
63@@ -0,0 +1 @@
64+Silly example
65diff --git a/hello b/hello
66new file mode 100644
67index 0000000..557db03
68--- /dev/null
69+++ b/hello
70@@ -0,0 +1 @@
71+Hello World
72EOF
73
74git-whatchanged -p --root | \
75 sed -e "1s/^\(.\{10\}\).\{40\}/\1VARIABLE/" \
76 -e "2,3s/^\(.\{8\}\).*$/\1VARIABLE/" \
77> whatchanged.output
78test_expect_success 'git-whatchanged -p --root' 'cmp whatchanged.expect whatchanged.output'
79
80git tag my-first-tag
81test_expect_success 'git tag my-first-tag' 'cmp .git/refs/heads/master .git/refs/tags/my-first-tag'
82
83# TODO: test git-clone
84
85git checkout -b mybranch
86test_expect_success 'git checkout -b mybranch' 'cmp .git/refs/heads/master .git/refs/heads/mybranch'
87
88cat > branch.expect <<EOF
89 master
90* mybranch
91EOF
92
93git branch > branch.output
94test_expect_success 'git branch' 'cmp branch.expect branch.output'
95
96git checkout mybranch
97echo "Work, work, work" >>hello
98git commit -m 'Some work.' hello
99
100git checkout master
101
102echo "Play, play, play" >>hello
103echo "Lots of fun" >>example
104git commit -m 'Some fun.' hello example
105
106test_expect_failure 'git resolve now fails' 'git resolve HEAD mybranch "Merge work in mybranch"'
107
108cat > hello << EOF
109Hello World
110It's a new day for git
111Play, play, play
112Work, work, work
113EOF
114
115git commit -m 'Merged "mybranch" changes.' hello
116
117cat > show-branch.expect << EOF
118* [master] Merged "mybranch" changes.
119 ! [mybranch] Some work.
120--
ebedc319
JH
121- [master] Merged "mybranch" changes.
122*+ [mybranch] Some work.
2ae6c706
JS
123EOF
124
4bc51db0 125git show-branch --topo-order master mybranch > show-branch.output
2ae6c706
JS
126test_expect_success 'git show-branch' 'cmp show-branch.expect show-branch.output'
127
128git checkout mybranch
129
130cat > resolve.expect << EOF
131Updating from VARIABLE to VARIABLE.
132 example | 1 +
133 hello | 1 +
134 2 files changed, 2 insertions(+), 0 deletions(-)
135EOF
136
137git resolve HEAD master "Merge upstream changes." | \
138 sed -e "1s/[0-9a-f]\{40\}/VARIABLE/g" > resolve.output
139test_expect_success 'git resolve' 'cmp resolve.expect resolve.output'
140
141cat > show-branch2.expect << EOF
142! [master] Merged "mybranch" changes.
143 * [mybranch] Merged "mybranch" changes.
144--
ebedc319 145-- [master] Merged "mybranch" changes.
2ae6c706
JS
146EOF
147
4bc51db0 148git show-branch --topo-order master mybranch > show-branch2.output
2ae6c706
JS
149test_expect_success 'git show-branch' 'cmp show-branch2.expect show-branch2.output'
150
151# TODO: test git fetch
152
153# TODO: test git push
154
155test_expect_success 'git repack' 'git repack'
156test_expect_success 'git prune-packed' 'git prune-packed'
157test_expect_failure '-> only packed objects' 'find -type f .git/objects/[0-9a-f][0-9a-f]'
158
159test_done
160