]>
Commit | Line | Data |
---|---|---|
fa21b602 JK |
1 | #!/bin/sh |
2 | ||
5be60078 | 3 | test_description='git rev-list --pretty=format test' |
fa21b602 JK |
4 | |
5 | . ./test-lib.sh | |
6 | ||
7 | test_tick | |
8 | test_expect_success 'setup' ' | |
3604e7c5 NS |
9 | touch foo && git add foo && git commit -m "added foo" && |
10 | echo changed >foo && git commit -a -m "changed foo" | |
fa21b602 JK |
11 | ' |
12 | ||
13 | # usage: test_format name format_string <expected_output | |
2581ad5e | 14 | test_format () { |
fa21b602 JK |
15 | cat >expect.$1 |
16 | test_expect_success "format $1" " | |
2581ad5e JH |
17 | git rev-list --pretty=format:'$2' master >output.$1 && |
18 | test_cmp expect.$1 output.$1 | |
19 | " | |
fa21b602 JK |
20 | } |
21 | ||
0a0416a3 JK |
22 | test_format percent %%h <<'EOF' |
23 | commit 131a310eb913d107dd3c09a65d1651175898735d | |
24 | %h | |
25 | commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873 | |
26 | %h | |
27 | EOF | |
28 | ||
fa21b602 JK |
29 | test_format hash %H%n%h <<'EOF' |
30 | commit 131a310eb913d107dd3c09a65d1651175898735d | |
31 | 131a310eb913d107dd3c09a65d1651175898735d | |
32 | 131a310 | |
33 | commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873 | |
34 | 86c75cfd708a0e5868dc876ed5b8bb66c80b4873 | |
35 | 86c75cf | |
36 | EOF | |
37 | ||
38 | test_format tree %T%n%t <<'EOF' | |
39 | commit 131a310eb913d107dd3c09a65d1651175898735d | |
40 | fe722612f26da5064c32ca3843aa154bdb0b08a0 | |
41 | fe72261 | |
42 | commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873 | |
43 | 4d5fcadc293a348e88f777dc0920f11e7d71441c | |
44 | 4d5fcad | |
45 | EOF | |
46 | ||
47 | test_format parents %P%n%p <<'EOF' | |
48 | commit 131a310eb913d107dd3c09a65d1651175898735d | |
542e165c JH |
49 | 86c75cfd708a0e5868dc876ed5b8bb66c80b4873 |
50 | 86c75cf | |
fa21b602 | 51 | commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873 |
542e165c JH |
52 | |
53 | ||
fa21b602 JK |
54 | EOF |
55 | ||
56 | # we don't test relative here | |
57 | test_format author %an%n%ae%n%ad%n%aD%n%at <<'EOF' | |
58 | commit 131a310eb913d107dd3c09a65d1651175898735d | |
59 | A U Thor | |
60 | author@example.com | |
61 | Thu Apr 7 15:13:13 2005 -0700 | |
62 | Thu, 7 Apr 2005 15:13:13 -0700 | |
63 | 1112911993 | |
64 | commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873 | |
65 | A U Thor | |
66 | author@example.com | |
67 | Thu Apr 7 15:13:13 2005 -0700 | |
68 | Thu, 7 Apr 2005 15:13:13 -0700 | |
69 | 1112911993 | |
70 | EOF | |
71 | ||
72 | test_format committer %cn%n%ce%n%cd%n%cD%n%ct <<'EOF' | |
73 | commit 131a310eb913d107dd3c09a65d1651175898735d | |
74 | C O Mitter | |
75 | committer@example.com | |
76 | Thu Apr 7 15:13:13 2005 -0700 | |
77 | Thu, 7 Apr 2005 15:13:13 -0700 | |
78 | 1112911993 | |
79 | commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873 | |
80 | C O Mitter | |
81 | committer@example.com | |
82 | Thu Apr 7 15:13:13 2005 -0700 | |
83 | Thu, 7 Apr 2005 15:13:13 -0700 | |
84 | 1112911993 | |
85 | EOF | |
86 | ||
87 | test_format encoding %e <<'EOF' | |
88 | commit 131a310eb913d107dd3c09a65d1651175898735d | |
fa21b602 | 89 | commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873 |
fa21b602 JK |
90 | EOF |
91 | ||
92 | test_format subject %s <<'EOF' | |
93 | commit 131a310eb913d107dd3c09a65d1651175898735d | |
94 | changed foo | |
95 | commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873 | |
96 | added foo | |
97 | EOF | |
98 | ||
99 | test_format body %b <<'EOF' | |
100 | commit 131a310eb913d107dd3c09a65d1651175898735d | |
fa21b602 | 101 | commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873 |
fa21b602 JK |
102 | EOF |
103 | ||
1367b12a EB |
104 | test_format raw-body %B <<'EOF' |
105 | commit 131a310eb913d107dd3c09a65d1651175898735d | |
106 | changed foo | |
107 | ||
108 | commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873 | |
109 | added foo | |
110 | ||
111 | EOF | |
112 | ||
fa21b602 JK |
113 | test_format colors %Credfoo%Cgreenbar%Cbluebaz%Cresetxyzzy <<'EOF' |
114 | commit 131a310eb913d107dd3c09a65d1651175898735d | |
115 | \e[31mfoo\e[32mbar\e[34mbaz\e[mxyzzy | |
116 | commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873 | |
117 | \e[31mfoo\e[32mbar\e[34mbaz\e[mxyzzy | |
118 | EOF | |
119 | ||
c002922a JK |
120 | test_format advanced-colors '%C(red yellow bold)foo%C(reset)' <<'EOF' |
121 | commit 131a310eb913d107dd3c09a65d1651175898735d | |
122 | \e[1;31;43mfoo\e[m | |
123 | commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873 | |
124 | \e[1;31;43mfoo\e[m | |
125 | EOF | |
126 | ||
03bcaaca JK |
127 | cat >commit-msg <<'EOF' |
128 | Test printing of complex bodies | |
129 | ||
130 | This commit message is much longer than the others, | |
131 | and it will be encoded in iso8859-1. We should therefore | |
132 | include an iso8859 character: ¡bueno! | |
133 | EOF | |
134 | test_expect_success 'setup complex body' ' | |
5be60078 | 135 | git config i18n.commitencoding iso8859-1 && |
3604e7c5 | 136 | echo change2 >foo && git commit -a -F commit-msg |
03bcaaca JK |
137 | ' |
138 | ||
139 | test_format complex-encoding %e <<'EOF' | |
140 | commit f58db70b055c5718631e5c61528b28b12090cdea | |
141 | iso8859-1 | |
142 | commit 131a310eb913d107dd3c09a65d1651175898735d | |
03bcaaca | 143 | commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873 |
03bcaaca JK |
144 | EOF |
145 | ||
146 | test_format complex-subject %s <<'EOF' | |
147 | commit f58db70b055c5718631e5c61528b28b12090cdea | |
148 | Test printing of complex bodies | |
149 | commit 131a310eb913d107dd3c09a65d1651175898735d | |
150 | changed foo | |
151 | commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873 | |
152 | added foo | |
153 | EOF | |
154 | ||
155 | test_format complex-body %b <<'EOF' | |
156 | commit f58db70b055c5718631e5c61528b28b12090cdea | |
157 | This commit message is much longer than the others, | |
158 | and it will be encoded in iso8859-1. We should therefore | |
159 | include an iso8859 character: ¡bueno! | |
160 | ||
161 | commit 131a310eb913d107dd3c09a65d1651175898735d | |
03bcaaca | 162 | commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873 |
03bcaaca JK |
163 | EOF |
164 | ||
9130ac9f JK |
165 | test_expect_success '%x00 shows NUL' ' |
166 | echo >expect commit f58db70b055c5718631e5c61528b28b12090cdea && | |
167 | echo >>expect fooQbar && | |
168 | git rev-list -1 --format=foo%x00bar HEAD >actual.nul && | |
169 | nul_to_q <actual.nul >actual && | |
170 | test_cmp expect actual | |
171 | ' | |
172 | ||
d36f8679 JK |
173 | test_expect_success '%ad respects --date=' ' |
174 | echo 2005-04-07 >expect.ad-short && | |
175 | git log -1 --date=short --pretty=tformat:%ad >output.ad-short master && | |
176 | test_cmp expect.ad-short output.ad-short | |
177 | ' | |
178 | ||
f7ab5c79 JH |
179 | test_expect_success 'empty email' ' |
180 | test_tick && | |
181 | C=$(GIT_AUTHOR_EMAIL= git commit-tree HEAD^{tree} </dev/null) && | |
182 | A=$(git show --pretty=format:%an,%ae,%ad%n -s $C) && | |
183 | test "$A" = "A U Thor,,Thu Apr 7 15:14:13 2005 -0700" || { | |
184 | echo "Eh? $A" >failure | |
185 | false | |
186 | } | |
187 | ' | |
188 | ||
9fa708da JH |
189 | test_expect_success 'del LF before empty (1)' ' |
190 | git show -s --pretty=format:"%s%n%-b%nThanks%n" HEAD^^ >actual && | |
3fb0459b | 191 | test_line_count = 2 actual |
9fa708da JH |
192 | ' |
193 | ||
194 | test_expect_success 'del LF before empty (2)' ' | |
195 | git show -s --pretty=format:"%s%n%-b%nThanks%n" HEAD >actual && | |
3fb0459b | 196 | test_line_count = 6 actual && |
9fa708da JH |
197 | grep "^$" actual |
198 | ' | |
199 | ||
200 | test_expect_success 'add LF before non-empty (1)' ' | |
201 | git show -s --pretty=format:"%s%+b%nThanks%n" HEAD^^ >actual && | |
3fb0459b | 202 | test_line_count = 2 actual |
9fa708da JH |
203 | ' |
204 | ||
205 | test_expect_success 'add LF before non-empty (2)' ' | |
206 | git show -s --pretty=format:"%s%+b%nThanks%n" HEAD >actual && | |
3fb0459b | 207 | test_line_count = 6 actual && |
9fa708da JH |
208 | grep "^$" actual |
209 | ' | |
210 | ||
7b88176e MG |
211 | test_expect_success 'add SP before non-empty (1)' ' |
212 | git show -s --pretty=format:"%s% bThanks" HEAD^^ >actual && | |
213 | test $(wc -w <actual) = 2 | |
214 | ' | |
215 | ||
216 | test_expect_success 'add SP before non-empty (2)' ' | |
217 | git show -s --pretty=format:"%s% sThanks" HEAD^^ >actual && | |
218 | test $(wc -w <actual) = 4 | |
219 | ' | |
220 | ||
c1977021 WP |
221 | test_expect_success '--abbrev' ' |
222 | echo SHORT SHORT SHORT >expect2 && | |
223 | echo LONG LONG LONG >expect3 && | |
224 | git log -1 --format="%h %h %h" HEAD >actual1 && | |
225 | git log -1 --abbrev=5 --format="%h %h %h" HEAD >actual2 && | |
226 | git log -1 --abbrev=5 --format="%H %H %H" HEAD >actual3 && | |
227 | sed -e "s/$_x40/LONG/g" -e "s/$_x05/SHORT/g" <actual2 >fuzzy2 && | |
228 | sed -e "s/$_x40/LONG/g" -e "s/$_x05/SHORT/g" <actual3 >fuzzy3 && | |
229 | test_cmp expect2 fuzzy2 && | |
230 | test_cmp expect3 fuzzy3 && | |
231 | ! test_cmp actual1 actual2 | |
232 | ' | |
233 | ||
234 | test_expect_success '%H is not affected by --abbrev-commit' ' | |
235 | git log -1 --format=%H --abbrev-commit --abbrev=20 HEAD >actual && | |
236 | len=$(wc -c <actual) && | |
237 | test $len = 41 | |
238 | ' | |
239 | ||
240 | test_expect_success '%h is not affected by --abbrev-commit' ' | |
241 | git log -1 --format=%h --abbrev-commit --abbrev=20 HEAD >actual && | |
242 | len=$(wc -c <actual) && | |
243 | test $len = 21 | |
244 | ' | |
245 | ||
8f8f5476 TR |
246 | test_expect_success '"%h %gD: %gs" is same as git-reflog' ' |
247 | git reflog >expect && | |
248 | git log -g --format="%h %gD: %gs" >actual && | |
249 | test_cmp expect actual | |
250 | ' | |
251 | ||
252 | test_expect_success '"%h %gD: %gs" is same as git-reflog (with date)' ' | |
253 | git reflog --date=raw >expect && | |
254 | git log -g --format="%h %gD: %gs" --date=raw >actual && | |
255 | test_cmp expect actual | |
256 | ' | |
257 | ||
c1977021 WP |
258 | test_expect_success '"%h %gD: %gs" is same as git-reflog (with --abbrev)' ' |
259 | git reflog --abbrev=13 --date=raw >expect && | |
260 | git log -g --abbrev=13 --format="%h %gD: %gs" --date=raw >actual && | |
261 | test_cmp expect actual | |
262 | ' | |
263 | ||
8f8f5476 TR |
264 | test_expect_success '%gd shortens ref name' ' |
265 | echo "master@{0}" >expect.gd-short && | |
266 | git log -g -1 --format=%gd refs/heads/master >actual.gd-short && | |
267 | test_cmp expect.gd-short actual.gd-short | |
268 | ' | |
269 | ||
cd1957f5 JK |
270 | test_expect_success 'reflog identity' ' |
271 | echo "C O Mitter:committer@example.com" >expect && | |
272 | git log -g -1 --format="%gn:%ge" >actual && | |
273 | test_cmp expect actual | |
274 | ' | |
275 | ||
1fb5fdd2 EFL |
276 | test_expect_success 'oneline with empty message' ' |
277 | git commit -m "dummy" --allow-empty && | |
278 | git commit -m "dummy" --allow-empty && | |
279 | git filter-branch --msg-filter "sed -e s/dummy//" HEAD^^.. && | |
f02dd06e | 280 | git rev-list --oneline HEAD >test.txt && |
3fb0459b SL |
281 | test_line_count = 5 test.txt && |
282 | git rev-list --oneline --graph HEAD >testg.txt && | |
283 | test_line_count = 5 testg.txt | |
1fb5fdd2 EFL |
284 | ' |
285 | ||
d9955fd6 JK |
286 | test_expect_success 'single-character name is parsed correctly' ' |
287 | git commit --author="a <a@example.com>" --allow-empty -m foo && | |
288 | echo "a <a@example.com>" >expect && | |
289 | git log -1 --format="%an <%ae>" >actual && | |
290 | test_cmp expect actual | |
291 | ' | |
292 | ||
fa21b602 | 293 | test_done |