merge-recursive: demonstrate an incorrect conflict with submodule
[git/dscho.git] / t / t6006-rev-list-format.sh
blob9b77073df880d4597742e20d738273244d2e4a10
1 #!/bin/sh
3 test_description='git rev-list --pretty=format test'
5 . ./test-lib.sh
7 test_tick
8 test_expect_success 'setup' '
9 touch foo && git add foo && git commit -m "added foo" &&
10 echo changed >foo && git commit -a -m "changed foo"
13 # usage: test_format name format_string <expected_output
14 test_format() {
15 cat >expect.$1
16 test_expect_success "format $1" "
17 git rev-list --pretty=format:'$2' master >output.$1 &&
18 test_cmp expect.$1 output.$1
22 test_format percent %%h <<'EOF'
23 commit 131a310eb913d107dd3c09a65d1651175898735d
25 commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
27 EOF
29 test_format hash %H%n%h <<'EOF'
30 commit 131a310eb913d107dd3c09a65d1651175898735d
31 131a310eb913d107dd3c09a65d1651175898735d
32 131a310
33 commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
34 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
35 86c75cf
36 EOF
38 test_format tree %T%n%t <<'EOF'
39 commit 131a310eb913d107dd3c09a65d1651175898735d
40 fe722612f26da5064c32ca3843aa154bdb0b08a0
41 fe72261
42 commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
43 4d5fcadc293a348e88f777dc0920f11e7d71441c
44 4d5fcad
45 EOF
47 test_format parents %P%n%p <<'EOF'
48 commit 131a310eb913d107dd3c09a65d1651175898735d
49 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
50 86c75cf
51 commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
54 EOF
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
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
87 test_format encoding %e <<'EOF'
88 commit 131a310eb913d107dd3c09a65d1651175898735d
89 commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
90 EOF
92 test_format subject %s <<'EOF'
93 commit 131a310eb913d107dd3c09a65d1651175898735d
94 changed foo
95 commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
96 added foo
97 EOF
99 test_format body %b <<'EOF'
100 commit 131a310eb913d107dd3c09a65d1651175898735d
101 commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
104 test_format raw-body %B <<'EOF'
105 commit 131a310eb913d107dd3c09a65d1651175898735d
106 changed foo
108 commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
109 added foo
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
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
127 cat >commit-msg <<'EOF'
128 Test printing of complex bodies
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!
134 test_expect_success 'setup complex body' '
135 git config i18n.commitencoding iso8859-1 &&
136 echo change2 >foo && git commit -a -F commit-msg
139 test_format complex-encoding %e <<'EOF'
140 commit f58db70b055c5718631e5c61528b28b12090cdea
141 iso8859-1
142 commit 131a310eb913d107dd3c09a65d1651175898735d
143 commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
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
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!
161 commit 131a310eb913d107dd3c09a65d1651175898735d
162 commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
165 test_expect_success '%ad respects --date=' '
166 echo 2005-04-07 >expect.ad-short &&
167 git log -1 --date=short --pretty=tformat:%ad >output.ad-short master &&
168 test_cmp expect.ad-short output.ad-short
171 test_expect_success 'empty email' '
172 test_tick &&
173 C=$(GIT_AUTHOR_EMAIL= git commit-tree HEAD^{tree} </dev/null) &&
174 A=$(git show --pretty=format:%an,%ae,%ad%n -s $C) &&
175 test "$A" = "A U Thor,,Thu Apr 7 15:14:13 2005 -0700" || {
176 echo "Eh? $A" >failure
177 false
181 test_expect_success 'del LF before empty (1)' '
182 git show -s --pretty=format:"%s%n%-b%nThanks%n" HEAD^^ >actual &&
183 test $(wc -l <actual) = 2
186 test_expect_success 'del LF before empty (2)' '
187 git show -s --pretty=format:"%s%n%-b%nThanks%n" HEAD >actual &&
188 test $(wc -l <actual) = 6 &&
189 grep "^$" actual
192 test_expect_success 'add LF before non-empty (1)' '
193 git show -s --pretty=format:"%s%+b%nThanks%n" HEAD^^ >actual &&
194 test $(wc -l <actual) = 2
197 test_expect_success 'add LF before non-empty (2)' '
198 git show -s --pretty=format:"%s%+b%nThanks%n" HEAD >actual &&
199 test $(wc -l <actual) = 6 &&
200 grep "^$" actual
203 test_expect_success '--abbrev' '
204 echo SHORT SHORT SHORT >expect2 &&
205 echo LONG LONG LONG >expect3 &&
206 git log -1 --format="%h %h %h" HEAD >actual1 &&
207 git log -1 --abbrev=5 --format="%h %h %h" HEAD >actual2 &&
208 git log -1 --abbrev=5 --format="%H %H %H" HEAD >actual3 &&
209 sed -e "s/$_x40/LONG/g" -e "s/$_x05/SHORT/g" <actual2 >fuzzy2 &&
210 sed -e "s/$_x40/LONG/g" -e "s/$_x05/SHORT/g" <actual3 >fuzzy3 &&
211 test_cmp expect2 fuzzy2 &&
212 test_cmp expect3 fuzzy3 &&
213 ! test_cmp actual1 actual2
216 test_expect_success '%H is not affected by --abbrev-commit' '
217 git log -1 --format=%H --abbrev-commit --abbrev=20 HEAD >actual &&
218 len=$(wc -c <actual) &&
219 test $len = 41
222 test_expect_success '%h is not affected by --abbrev-commit' '
223 git log -1 --format=%h --abbrev-commit --abbrev=20 HEAD >actual &&
224 len=$(wc -c <actual) &&
225 test $len = 21
228 test_expect_success '"%h %gD: %gs" is same as git-reflog' '
229 git reflog >expect &&
230 git log -g --format="%h %gD: %gs" >actual &&
231 test_cmp expect actual
234 test_expect_success '"%h %gD: %gs" is same as git-reflog (with date)' '
235 git reflog --date=raw >expect &&
236 git log -g --format="%h %gD: %gs" --date=raw >actual &&
237 test_cmp expect actual
240 test_expect_success '"%h %gD: %gs" is same as git-reflog (with --abbrev)' '
241 git reflog --abbrev=13 --date=raw >expect &&
242 git log -g --abbrev=13 --format="%h %gD: %gs" --date=raw >actual &&
243 test_cmp expect actual
246 test_expect_success '%gd shortens ref name' '
247 echo "master@{0}" >expect.gd-short &&
248 git log -g -1 --format=%gd refs/heads/master >actual.gd-short &&
249 test_cmp expect.gd-short actual.gd-short
252 test_expect_success 'oneline with empty message' '
253 git commit -m "dummy" --allow-empty &&
254 git commit -m "dummy" --allow-empty &&
255 git filter-branch --msg-filter "sed -e s/dummy//" HEAD^^.. &&
256 git rev-list --oneline HEAD >test.txt &&
257 test $(git rev-list --oneline HEAD | wc -l) -eq 5 &&
258 test $(git rev-list --oneline --graph HEAD | wc -l) -eq 5
261 test_done