3 # Copyright (c) 2006 Junio C Hamano
6 test_description='Various diff formatting options'
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 &&
21 for i in 1 2 3; do echo $i; done >file0 &&
22 for i in A B; do echo $i; done >dir/sub &&
24 git add file0 file2 dir/sub &&
25 git commit -m Initial &&
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 &&
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 &&
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 &&
55 for i in A B C; do echo $i; done >>file0 &&
56 for i in 1 2; do echo $i; done >>dir/sub &&
59 git update-index file0 dir/sub &&
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 &&
78 cp dir/sub dir3/sub &&
79 test-chmtime +1 dir3/sub &&
81 git config log.showroot false &&
84 GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
85 GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
86 export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
87 git checkout -b rearrange initial &&
88 for i in B A; do echo $i; done >dir/sub &&
90 git commit -m "Rearranged lines in dir/sub" &&
91 git checkout master &&
93 GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
94 GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
95 export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
96 git checkout -b mode initial &&
97 git update-index --chmod=+x file0 &&
98 git commit -m "update mode" &&
99 git checkout -f master &&
101 git config diff.renames false &&
108 * [master] Merge branch 'side'
109 ! [rearrange] Rearranged lines in dir/sub
112 + [rearrange] Rearranged lines in dir/sub
113 - [master] Merge branch 'side'
117 +*++ [initial] Initial
120 V=$(git version | sed -e 's/^git version //' -e 's/\./\\./g')
132 die "bug in t4103: unknown magic $magic" ;;
135 cmd="$magic $cmd" magic=
138 test=$(echo "$label" | sed -e 's|[/ ][/ ]*|_|g')
139 pfx=$(printf "%04d" $test_count)
140 expect="$TEST_DIRECTORY/t4013/diff.$test"
141 actual="$pfx-diff.$test"
143 test_expect_success "git $cmd" '
148 GIT_PRINT_SHA1_ELLIPSIS=yes git $cmd ;;
152 sed -e "s/^\\(-*\\)$V\\(-*\\)\$/\\1g-i-t--v-e-r-s-i-o-n\2/" \
153 -e "s/^\\(.*mixed; boundary=\"-*\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/"
159 *format-patch* | *-stat*)
160 test_i18ncmp "$expect" "$actual";;
162 test_cmp "$expect" "$actual";;
166 # this is to help developing new tests.
167 cp "$actual" "$expect"
174 diff-tree -r --abbrev initial
175 diff-tree -r --abbrev=4 initial
176 diff-tree --root initial
177 diff-tree --root --abbrev initial
178 diff-tree --root -r initial
179 diff-tree --root -r --abbrev initial
180 diff-tree --root -r --abbrev=4 initial
182 diff-tree --root -p initial
183 diff-tree --patch-with-stat initial
184 diff-tree --root --patch-with-stat initial
185 diff-tree --patch-with-raw initial
186 diff-tree --root --patch-with-raw initial
188 diff-tree --pretty initial
189 diff-tree --pretty --root initial
190 diff-tree --pretty -p initial
191 diff-tree --pretty --stat initial
192 diff-tree --pretty --summary initial
193 diff-tree --pretty --stat --summary initial
194 diff-tree --pretty --root -p initial
195 diff-tree --pretty --root --stat initial
196 # improved by Timo's patch
197 diff-tree --pretty --root --summary initial
198 # improved by Timo's patch
199 diff-tree --pretty --root --summary -r initial
200 diff-tree --pretty --root --stat --summary initial
201 diff-tree --pretty --patch-with-stat initial
202 diff-tree --pretty --root --patch-with-stat initial
203 diff-tree --pretty --patch-with-raw initial
204 diff-tree --pretty --root --patch-with-raw initial
206 diff-tree --pretty=oneline initial
207 diff-tree --pretty=oneline --root initial
208 diff-tree --pretty=oneline -p initial
209 diff-tree --pretty=oneline --root -p initial
210 diff-tree --pretty=oneline --patch-with-stat initial
211 # improved by Timo's patch
212 diff-tree --pretty=oneline --root --patch-with-stat initial
213 diff-tree --pretty=oneline --patch-with-raw initial
214 diff-tree --pretty=oneline --root --patch-with-raw initial
216 diff-tree --pretty side
217 diff-tree --pretty -p side
218 diff-tree --pretty --patch-with-stat side
220 diff-tree initial mode
221 diff-tree --stat initial mode
222 diff-tree --summary initial mode
226 diff-tree -p -m master
228 diff-tree -c --abbrev master
229 diff-tree --cc master
230 # stat only should show the diffstat with the first parent
231 diff-tree -c --stat master
232 diff-tree --cc --stat master
233 diff-tree -c --stat --summary master
234 diff-tree --cc --stat --summary master
235 # stat summary should show the diffstat and summary with the first parent
236 diff-tree -c --stat --summary side
237 diff-tree --cc --stat --summary side
238 # improved by Timo's patch
239 diff-tree --cc --patch-with-stat master
240 # improved by Timo's patch
241 diff-tree --cc --patch-with-stat --summary master
243 diff-tree --cc --patch-with-stat --summary side
249 log --patch-with-stat master
250 log --root --patch-with-stat master
251 log --root --patch-with-stat --summary master
252 # improved by Timo's patch
253 log --root -c --patch-with-stat --summary master
254 # improved by Timo's patch
255 log --root --cc --patch-with-stat --summary master
256 log -p --first-parent master
257 log -m -p --first-parent master
262 log -SF master --max-count=0
263 log -SF master --max-count=1
264 log -SF master --max-count=2
267 log -GF -p --pickaxe-all master
269 log --decorate=full --all
271 rev-list --parents HEAD
272 rev-list --children HEAD
275 whatchanged -p master
276 whatchanged --root master
277 whatchanged --root -p master
278 whatchanged --patch-with-stat master
279 whatchanged --root --patch-with-stat master
280 whatchanged --root --patch-with-stat --summary master
281 # improved by Timo's patch
282 whatchanged --root -c --patch-with-stat --summary master
283 # improved by Timo's patch
284 whatchanged --root --cc --patch-with-stat --summary master
285 whatchanged -SF master
286 whatchanged -SF -p master
288 log --patch-with-stat master -- dir/
289 whatchanged --patch-with-stat master -- dir/
290 log --patch-with-stat --summary master -- dir/
291 whatchanged --patch-with-stat --summary master -- dir/
299 show --first-parent master
301 show --stat --summary side
302 show --patch-with-stat side
303 show --patch-with-raw side
304 show --patch-with-stat --summary side
306 format-patch --stdout initial..side
307 format-patch --stdout initial..master^
308 format-patch --stdout initial..master
309 format-patch --stdout --no-numbered initial..master
310 format-patch --stdout --numbered initial..master
311 format-patch --attach --stdout initial..side
312 format-patch --attach --stdout --suffix=.diff initial..side
313 format-patch --attach --stdout initial..master^
314 format-patch --attach --stdout initial..master
315 format-patch --inline --stdout initial..side
316 format-patch --inline --stdout initial..master^
317 format-patch --inline --stdout --numbered-files initial..master
318 format-patch --inline --stdout initial..master
319 format-patch --inline --stdout --subject-prefix=TESTCASE initial..master
320 config format.subjectprefix DIFFERENT_PREFIX
321 format-patch --inline --stdout initial..master^^
322 format-patch --stdout --cover-letter -n initial..master^
324 diff --abbrev initial..side
325 diff -r initial..side
326 diff --stat initial..side
327 diff -r --stat initial..side
329 diff --patch-with-stat initial..side
330 diff --patch-with-raw initial..side
331 diff --patch-with-stat -r initial..side
332 diff --patch-with-raw -r initial..side
333 diff --name-status dir2 dir
334 diff --no-index --name-status dir2 dir
335 diff --no-index --name-status -- dir2 dir
336 diff --no-index dir dir3
337 diff master master^ side
338 # Can't use spaces...
339 diff --line-prefix=abc master master^ side
340 diff --dirstat master~1 master~2
341 diff --dirstat initial rearrange
342 diff --dirstat-by-file initial rearrange
343 # No-index --abbrev and --no-abbrev
345 diff --raw --abbrev=4 initial
346 diff --raw --no-abbrev initial
347 diff --no-index --raw dir2 dir
348 diff --no-index --raw --abbrev=4 dir2 dir
349 diff --no-index --raw --no-abbrev dir2 dir
352 test_expect_success 'log -S requires an argument' '
353 test_must_fail git log -S
356 test_expect_success 'diff --cached on unborn branch' '
357 echo ref: refs/heads/unborn >.git/HEAD &&
358 git diff --cached >result &&
359 test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--cached" result
362 test_expect_success 'diff --cached -- file on unborn branch' '
363 git diff --cached -- file0 >result &&
364 test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--cached_--_file0" result
366 test_expect_success 'diff --line-prefix with spaces' '
367 git diff --line-prefix="| | | " --cached -- file0 >result &&
368 test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--line-prefix_--cached_--_file0" result
371 test_expect_success 'diff-tree --stdin with log formatting' '
372 cat >expect <<-\EOF &&
377 git rev-list master | git diff-tree --stdin --format=%s -s >actual &&
378 test_cmp expect actual