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