3 # Copyright (c) 2006 Junio C Hamano
6 test_description
='Various diff formatting options'
10 test_expect_success setup
'
12 GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
13 GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
14 export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
17 for i in 1 2 3; do echo $i; done >file0 &&
18 for i in A B; do echo $i; done >dir/sub &&
20 git add file0 file2 dir/sub &&
21 git commit -m Initial &&
26 GIT_AUTHOR_DATE="2006-06-26 00:01:00 +0000" &&
27 GIT_COMMITTER_DATE="2006-06-26 00:01:00 +0000" &&
28 export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
30 for i in 4 5 6; do echo $i; done >>file0 &&
31 for i in C D; do echo $i; done >>dir/sub &&
33 git update-index --remove file0 file2 dir/sub &&
34 git commit -m Second &&
36 GIT_AUTHOR_DATE="2006-06-26 00:02:00 +0000" &&
37 GIT_COMMITTER_DATE="2006-06-26 00:02:00 +0000" &&
38 export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
40 for i in A B C; do echo $i; done >file1 &&
42 for i in E F; do echo $i; done >>dir/sub &&
43 git update-index dir/sub &&
44 git commit -m Third &&
46 GIT_AUTHOR_DATE="2006-06-26 00:03:00 +0000" &&
47 GIT_COMMITTER_DATE="2006-06-26 00:03:00 +0000" &&
48 export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
51 for i in A B C; do echo $i; done >>file0 &&
52 for i in 1 2; do echo $i; done >>dir/sub &&
55 git update-index file0 dir/sub &&
58 GIT_AUTHOR_DATE="2006-06-26 00:04:00 +0000" &&
59 GIT_COMMITTER_DATE="2006-06-26 00:04:00 +0000" &&
60 export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
62 git checkout master &&
63 git pull -s ours . side &&
65 GIT_AUTHOR_DATE="2006-06-26 00:05:00 +0000" &&
66 GIT_COMMITTER_DATE="2006-06-26 00:05:00 +0000" &&
67 export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
69 for i in A B C; do echo $i; done >>file0 &&
70 for i in 1 2; do echo $i; done >>dir/sub &&
71 git update-index file0 dir/sub &&
73 EDITOR=: VISUAL=: git commit --amend &&
79 * [master
] Merge branch
'side'
82 - [master
] Merge branch
'side'
91 '' |
'#'*) continue ;;
93 test=`echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g'`
94 cnt
=`expr $test_count + 1`
95 pfx
=`printf "%04d" $cnt`
96 expect
="../t4013/diff.$test"
97 actual
="$pfx-diff.$test"
99 test_expect_success
"git $cmd" '
107 diff -u "$expect" "$actual" &&
110 # this is to help developing new tests.
111 cp "$actual" "$expect"
118 diff-tree
-r --abbrev initial
119 diff-tree
-r --abbrev=4 initial
120 diff-tree
--root initial
121 diff-tree
--root --abbrev initial
122 diff-tree
--root -r initial
123 diff-tree
--root -r --abbrev initial
124 diff-tree
--root -r --abbrev=4 initial
126 diff-tree
--root -p initial
127 diff-tree
--patch-with-stat initial
128 diff-tree
--root --patch-with-stat initial
129 diff-tree
--patch-with-raw initial
130 diff-tree
--root --patch-with-raw initial
132 diff-tree
--pretty initial
133 diff-tree
--pretty --root initial
134 diff-tree
--pretty -p initial
135 diff-tree
--pretty --stat initial
136 diff-tree
--pretty --summary initial
137 diff-tree
--pretty --stat --summary initial
138 diff-tree
--pretty --root -p initial
139 diff-tree
--pretty --root --stat initial
140 #diff-tree --pretty --root --summary initial
141 diff-tree
--pretty --root --stat --summary initial
142 diff-tree
--pretty --patch-with-stat initial
143 diff-tree
--pretty --root --patch-with-stat initial
144 diff-tree
--pretty --patch-with-raw initial
145 diff-tree
--pretty --root --patch-with-raw initial
147 diff-tree
--pretty=oneline initial
148 diff-tree
--pretty=oneline
--root initial
149 diff-tree
--pretty=oneline
-p initial
150 diff-tree
--pretty=oneline
--root -p initial
151 diff-tree
--pretty=oneline
--patch-with-stat initial
152 diff-tree
--pretty=oneline
--root --patch-with-stat initial
153 diff-tree
--pretty=oneline
--patch-with-raw initial
154 diff-tree
--pretty=oneline
--root --patch-with-raw initial
156 diff-tree
--pretty side
157 diff-tree
--pretty -p side
158 diff-tree
--pretty --patch-with-stat side
162 diff-tree
-p -m master
164 diff-tree
-c --abbrev master
165 diff-tree
--cc master
166 # stat only should show the diffstat with the first parent
167 diff-tree
-c --stat master
168 diff-tree
--cc --stat master
169 diff-tree
-c --stat --summary master
170 diff-tree
--cc --stat --summary master
171 # stat summary should show the diffstat and summary with the first parent
172 diff-tree
-c --stat --summary side
173 diff-tree
--cc --stat --summary side
174 # this one gives an extra newline after stat, which should be removed
175 # diff-tree --cc --patch-with-stat master
176 # this one gives an extra newline after stat, which should be removed
177 # other than that it shows the correct example -- stat and summary are
178 # against the first parent, and patch-looking combined diff follows.
179 diff-tree
--cc --patch-with-stat --summary master
181 diff-tree
--cc --patch-with-stat --summary side
187 log
--patch-with-stat master
188 log
--root --patch-with-stat master
189 log
--root --patch-with-stat --summary master
190 log
--root -c --patch-with-stat --summary master
191 log
--root --cc --patch-with-stat --summary master
196 whatchanged
-p master
197 whatchanged
--root master
198 whatchanged
--root -p master
199 whatchanged
--patch-with-stat master
200 whatchanged
--root --patch-with-stat master
201 whatchanged
--root --patch-with-stat --summary master
202 whatchanged
--root -c --patch-with-stat --summary master
203 whatchanged
--root --cc --patch-with-stat --summary master
204 whatchanged
-SF master
205 whatchanged
-SF -p master
207 log
--patch-with-stat master
-- dir
/
208 whatchanged
--patch-with-stat master
-- dir
/
209 log
--patch-with-stat --summary master
-- dir
/
210 whatchanged
--patch-with-stat --summary master
-- dir
/
217 show
--stat --summary side
218 show
--patch-with-stat side
219 show
--patch-with-raw side
220 show
--patch-with-stat --summary side