Merge branch 'maint'
[git.git] / t / t4013-diff-various.sh
blob9c709022efb1b553ef53b3100d39e852117cbeda
1 #!/bin/sh
3 # Copyright (c) 2006 Junio C Hamano
6 test_description='Various diff formatting options'
8 . ./test-lib.sh
10 LF='
13 test_expect_success setup '
15 GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
16 GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
17 export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
19 mkdir dir &&
20 mkdir dir2 &&
21 for i in 1 2 3; do echo $i; done >file0 &&
22 for i in A B; do echo $i; done >dir/sub &&
23 cat file0 >file2 &&
24 git add file0 file2 dir/sub &&
25 git commit -m Initial &&
27 git branch initial &&
28 git branch side &&
30 GIT_AUTHOR_DATE="2006-06-26 00:01:00 +0000" &&
31 GIT_COMMITTER_DATE="2006-06-26 00:01:00 +0000" &&
32 export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
34 for i in 4 5 6; do echo $i; done >>file0 &&
35 for i in C D; do echo $i; done >>dir/sub &&
36 rm -f file2 &&
37 git update-index --remove file0 file2 dir/sub &&
38 git commit -m "Second${LF}${LF}This is the second commit." &&
40 GIT_AUTHOR_DATE="2006-06-26 00:02:00 +0000" &&
41 GIT_COMMITTER_DATE="2006-06-26 00:02:00 +0000" &&
42 export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
44 for i in A B C; do echo $i; done >file1 &&
45 git add file1 &&
46 for i in E F; do echo $i; done >>dir/sub &&
47 git update-index dir/sub &&
48 git commit -m Third &&
50 GIT_AUTHOR_DATE="2006-06-26 00:03:00 +0000" &&
51 GIT_COMMITTER_DATE="2006-06-26 00:03:00 +0000" &&
52 export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
54 git checkout side &&
55 for i in A B C; do echo $i; done >>file0 &&
56 for i in 1 2; do echo $i; done >>dir/sub &&
57 cat dir/sub >file3 &&
58 git add file3 &&
59 git update-index file0 dir/sub &&
60 git commit -m Side &&
62 GIT_AUTHOR_DATE="2006-06-26 00:04:00 +0000" &&
63 GIT_COMMITTER_DATE="2006-06-26 00:04:00 +0000" &&
64 export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
66 git checkout master &&
67 git pull -s ours . side &&
69 GIT_AUTHOR_DATE="2006-06-26 00:05:00 +0000" &&
70 GIT_COMMITTER_DATE="2006-06-26 00:05:00 +0000" &&
71 export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
73 for i in A B C; do echo $i; done >>file0 &&
74 for i in 1 2; do echo $i; done >>dir/sub &&
75 git update-index file0 dir/sub &&
77 mkdir dir3 &&
78 cp dir/sub dir3/sub &&
79 test-chmtime +1 dir3/sub &&
81 git config log.showroot false &&
82 git commit --amend &&
83 git show-branch
86 : <<\EOF
87 ! [initial] Initial
88 * [master] Merge branch 'side'
89 ! [side] Side
90 ---
91 - [master] Merge branch 'side'
92 *+ [side] Side
93 * [master^] Second
94 +*+ [initial] Initial
95 EOF
97 V=`git version | sed -e 's/^git version //' -e 's/\./\\./g'`
98 while read cmd
100 case "$cmd" in
101 '' | '#'*) continue ;;
102 esac
103 test=`echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g'`
104 cnt=`expr $test_count + 1`
105 pfx=`printf "%04d" $cnt`
106 expect="$TEST_DIRECTORY/t4013/diff.$test"
107 actual="$pfx-diff.$test"
109 test_expect_success "git $cmd" '
111 echo "\$ git $cmd"
112 git $cmd |
113 sed -e "s/^\\(-*\\)$V\\(-*\\)\$/\\1g-i-t--v-e-r-s-i-o-n\2/" \
114 -e "s/^\\(.*mixed; boundary=\"-*\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/"
115 echo "\$"
116 } >"$actual" &&
117 if test -f "$expect"
118 then
119 test_cmp "$expect" "$actual" &&
120 rm -f "$actual"
121 else
122 # this is to help developing new tests.
123 cp "$actual" "$expect"
124 false
127 done <<\EOF
128 diff-tree initial
129 diff-tree -r initial
130 diff-tree -r --abbrev initial
131 diff-tree -r --abbrev=4 initial
132 diff-tree --root initial
133 diff-tree --root --abbrev initial
134 diff-tree --root -r initial
135 diff-tree --root -r --abbrev initial
136 diff-tree --root -r --abbrev=4 initial
137 diff-tree -p initial
138 diff-tree --root -p initial
139 diff-tree --patch-with-stat initial
140 diff-tree --root --patch-with-stat initial
141 diff-tree --patch-with-raw initial
142 diff-tree --root --patch-with-raw initial
144 diff-tree --pretty initial
145 diff-tree --pretty --root initial
146 diff-tree --pretty -p initial
147 diff-tree --pretty --stat initial
148 diff-tree --pretty --summary initial
149 diff-tree --pretty --stat --summary initial
150 diff-tree --pretty --root -p initial
151 diff-tree --pretty --root --stat initial
152 # improved by Timo's patch
153 diff-tree --pretty --root --summary initial
154 # improved by Timo's patch
155 diff-tree --pretty --root --summary -r initial
156 diff-tree --pretty --root --stat --summary initial
157 diff-tree --pretty --patch-with-stat initial
158 diff-tree --pretty --root --patch-with-stat initial
159 diff-tree --pretty --patch-with-raw initial
160 diff-tree --pretty --root --patch-with-raw initial
162 diff-tree --pretty=oneline initial
163 diff-tree --pretty=oneline --root initial
164 diff-tree --pretty=oneline -p initial
165 diff-tree --pretty=oneline --root -p initial
166 diff-tree --pretty=oneline --patch-with-stat initial
167 # improved by Timo's patch
168 diff-tree --pretty=oneline --root --patch-with-stat initial
169 diff-tree --pretty=oneline --patch-with-raw initial
170 diff-tree --pretty=oneline --root --patch-with-raw initial
172 diff-tree --pretty side
173 diff-tree --pretty -p side
174 diff-tree --pretty --patch-with-stat side
176 diff-tree master
177 diff-tree -p master
178 diff-tree -p -m master
179 diff-tree -c master
180 diff-tree -c --abbrev master
181 diff-tree --cc master
182 # stat only should show the diffstat with the first parent
183 diff-tree -c --stat master
184 diff-tree --cc --stat master
185 diff-tree -c --stat --summary master
186 diff-tree --cc --stat --summary master
187 # stat summary should show the diffstat and summary with the first parent
188 diff-tree -c --stat --summary side
189 diff-tree --cc --stat --summary side
190 # improved by Timo's patch
191 diff-tree --cc --patch-with-stat master
192 # improved by Timo's patch
193 diff-tree --cc --patch-with-stat --summary master
194 # this is correct
195 diff-tree --cc --patch-with-stat --summary side
197 log master
198 log -p master
199 log --root master
200 log --root -p master
201 log --patch-with-stat master
202 log --root --patch-with-stat master
203 log --root --patch-with-stat --summary master
204 # improved by Timo's patch
205 log --root -c --patch-with-stat --summary master
206 # improved by Timo's patch
207 log --root --cc --patch-with-stat --summary master
208 log -SF master
209 log -SF -p master
211 whatchanged master
212 whatchanged -p master
213 whatchanged --root master
214 whatchanged --root -p master
215 whatchanged --patch-with-stat master
216 whatchanged --root --patch-with-stat master
217 whatchanged --root --patch-with-stat --summary master
218 # improved by Timo's patch
219 whatchanged --root -c --patch-with-stat --summary master
220 # improved by Timo's patch
221 whatchanged --root --cc --patch-with-stat --summary master
222 whatchanged -SF master
223 whatchanged -SF -p master
225 log --patch-with-stat master -- dir/
226 whatchanged --patch-with-stat master -- dir/
227 log --patch-with-stat --summary master -- dir/
228 whatchanged --patch-with-stat --summary master -- dir/
230 show initial
231 show --root initial
232 show side
233 show master
234 show --stat side
235 show --stat --summary side
236 show --patch-with-stat side
237 show --patch-with-raw side
238 show --patch-with-stat --summary side
240 format-patch --stdout initial..side
241 format-patch --stdout initial..master^
242 format-patch --stdout initial..master
243 format-patch --stdout --no-numbered initial..master
244 format-patch --stdout --numbered initial..master
245 format-patch --attach --stdout initial..side
246 format-patch --attach --stdout initial..master^
247 format-patch --attach --stdout initial..master
248 format-patch --inline --stdout initial..side
249 format-patch --inline --stdout initial..master^
250 format-patch --inline --stdout initial..master
251 format-patch --inline --stdout initial..master
252 format-patch --inline --stdout --subject-prefix=TESTCASE initial..master
253 config format.subjectprefix DIFFERENT_PREFIX
254 format-patch --inline --stdout initial..master^^
255 format-patch --stdout --cover-letter -n initial..master^
257 diff --abbrev initial..side
258 diff -r initial..side
259 diff --stat initial..side
260 diff -r --stat initial..side
261 diff initial..side
262 diff --patch-with-stat initial..side
263 diff --patch-with-raw initial..side
264 diff --patch-with-stat -r initial..side
265 diff --patch-with-raw -r initial..side
266 diff --name-status dir2 dir
267 diff --no-index --name-status dir2 dir
268 diff --no-index --name-status -- dir2 dir
269 diff --no-index dir dir3
270 diff master master^ side
273 test_done