t6302: also test annotated in addition to signed tags

It is conceivable, if not highly plausible, that a change to the git-for-each-ref code that does the filtering and formatting can become buggy because a payload with GPG signature looks somewhat different from what is in an annotated but not signed tag. Thus, let's test unsigned tags, as well. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Eric Sunshine committed Mar 6, 2016 at 19:10 UTC 7bc734eed2f3cc4cd171aaaac9ffff8b047c3896
1 file changed +25
t/t6302-for-each-ref-filter.sh
+25
@@ -17,6 +17,8 @@ test_expect_success 'setup some history and refs' '
17 test_commit three &&
18 git checkout -b side &&
19 test_commit four &&
20 + git tag -m "An annotated tag" annotated-tag &&
21 + git tag -m "Annonated doubly" doubly-annotated-tag annotated-tag &&
22 git tag -s -m "A signed tag" signed-tag &&
23 git tag -s -m "Signed doubly" doubly-signed-tag signed-tag &&
24 git checkout master &&
@@ -36,6 +38,7 @@ test_expect_success 'filtering with --points-at' '
38 test_expect_success 'check signed tags with --points-at' '
39 sed -e "s/Z$//" >expect <<-\EOF &&
40 refs/heads/side Z
41 + refs/tags/annotated-tag four
42 refs/tags/four Z
43 refs/tags/signed-tag four
44 EOF
@@ -58,6 +61,8 @@ test_expect_success 'filtering with --merged' '
61 test_expect_success 'filtering with --no-merged' '
62 cat >expect <<-\EOF &&
63 refs/heads/side
64 + refs/tags/annotated-tag
65 + refs/tags/doubly-annotated-tag
66 refs/tags/doubly-signed-tag
67 refs/tags/four
68 refs/tags/signed-tag
@@ -71,6 +76,8 @@ test_expect_success 'filtering with --contains' '
76 refs/heads/master
77 refs/heads/side
78 refs/odd/spot
79 + refs/tags/annotated-tag
80 + refs/tags/doubly-annotated-tag
81 refs/tags/doubly-signed-tag
82 refs/tags/four
83 refs/tags/signed-tag
@@ -90,6 +97,8 @@ test_expect_success 'left alignment is default' '
97 refname is refs/heads/master |refs/heads/master
98 refname is refs/heads/side |refs/heads/side
99 refname is refs/odd/spot |refs/odd/spot
100 + refname is refs/tags/annotated-tag|refs/tags/annotated-tag
101 + refname is refs/tags/doubly-annotated-tag|refs/tags/doubly-annotated-tag
102 refname is refs/tags/doubly-signed-tag|refs/tags/doubly-signed-tag
103 refname is refs/tags/four |refs/tags/four
104 refname is refs/tags/one |refs/tags/one
@@ -106,6 +115,8 @@ test_expect_success 'middle alignment' '
115 | refname is refs/heads/master |refs/heads/master
116 | refname is refs/heads/side |refs/heads/side
117 | refname is refs/odd/spot |refs/odd/spot
118 + |refname is refs/tags/annotated-tag|refs/tags/annotated-tag
119 + |refname is refs/tags/doubly-annotated-tag|refs/tags/doubly-annotated-tag
120 |refname is refs/tags/doubly-signed-tag|refs/tags/doubly-signed-tag
121 | refname is refs/tags/four |refs/tags/four
122 | refname is refs/tags/one |refs/tags/one
@@ -122,6 +133,8 @@ test_expect_success 'right alignment' '
133 | refname is refs/heads/master|refs/heads/master
134 | refname is refs/heads/side|refs/heads/side
135 | refname is refs/odd/spot|refs/odd/spot
136 + |refname is refs/tags/annotated-tag|refs/tags/annotated-tag
137 + |refname is refs/tags/doubly-annotated-tag|refs/tags/doubly-annotated-tag
138 |refname is refs/tags/doubly-signed-tag|refs/tags/doubly-signed-tag
139 | refname is refs/tags/four|refs/tags/four
140 | refname is refs/tags/one|refs/tags/one
@@ -137,6 +150,8 @@ cat >expect <<-\EOF
150 | refname is refs/heads/master |refs/heads/master
151 | refname is refs/heads/side |refs/heads/side
152 | refname is refs/odd/spot |refs/odd/spot
153 +| refname is refs/tags/annotated-tag |refs/tags/annotated-tag
154 +|refname is refs/tags/doubly-annotated-tag |refs/tags/doubly-annotated-tag
155 | refname is refs/tags/doubly-signed-tag |refs/tags/doubly-signed-tag
156 | refname is refs/tags/four |refs/tags/four
157 | refname is refs/tags/one |refs/tags/one
@@ -182,6 +197,8 @@ test_expect_success 'alignment with format quote' "
197 |' '\''master| A U Thor'\'' '|
198 |' '\''side| A U Thor'\'' '|
199 |' '\''odd/spot| A U Thor'\'' '|
200 + |' '\''annotated-tag| '\'' '|
201 + |' '\''doubly-annotated-tag| '\'' '|
202 |' '\''doubly-signed-tag| '\'' '|
203 |' '\''four| A U Thor'\'' '|
204 |' '\''one| A U Thor'\'' '|
@@ -198,6 +215,8 @@ test_expect_success 'nested alignment with quote formatting' "
215 |' master '|
216 |' side '|
217 |' odd/spot '|
218 + |' annotated-tag '|
219 + |'doubly-annotated-tag '|
220 |'doubly-signed-tag '|
221 |' four '|
222 |' one '|
@@ -214,6 +233,8 @@ test_expect_success 'check `%(contents:lines=1)`' '
233 master |three
234 side |four
235 odd/spot |three
236 + annotated-tag |An annotated tag
237 + doubly-annotated-tag |Annonated doubly
238 doubly-signed-tag |Signed doubly
239 four |four
240 one |one
@@ -230,6 +251,8 @@ test_expect_success 'check `%(contents:lines=0)`' '
251 master |
252 side |
253 odd/spot |
254 + annotated-tag |
255 + doubly-annotated-tag |
256 doubly-signed-tag |
257 four |
258 one |
@@ -246,6 +269,8 @@ test_expect_success 'check `%(contents:lines=99999)`' '
269 master |three
270 side |four
271 odd/spot |three
272 + annotated-tag |An annotated tag
273 + doubly-annotated-tag |Annonated doubly
274 doubly-signed-tag |Signed doubly
275 four |four
276 one |one