t6302: normalize names and descriptions of signed tags
An upcoming patch will increase test coverage by testing annotated but not signed tags, as well, so normalize names and descriptions of signed tags to make it easy to give the upcoming unsigned tags similarly patterned names and descriptions. 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
ef93c7dbcebecfacaf195d02e54b614926e8c135
1 file changed
+15
-15
t/t6302-for-each-ref-filter.sh
+15
-15
@@ -17,8 +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 -s -m "A signed tag message" signed-tag &&
21
- git tag -s -m "Annonated doubly" double-tag signed-tag &&
20
+ git tag -s -m "A signed tag" signed-tag &&
21
+ git tag -s -m "Signed doubly" doubly-signed-tag signed-tag &&
22
git checkout master &&
23
git update-ref refs/odd/spot master
24
'
@@ -58,7 +58,7 @@ test_expect_success 'filtering with --merged' '
58
test_expect_success 'filtering with --no-merged' '
59
cat >expect <<-\EOF &&
60
refs/heads/side
61
- refs/tags/double-tag
61
+ refs/tags/doubly-signed-tag
62
refs/tags/four
63
refs/tags/signed-tag
64
EOF
@@ -71,7 +71,7 @@ test_expect_success 'filtering with --contains' '
71
refs/heads/master
72
refs/heads/side
73
refs/odd/spot
74
- refs/tags/double-tag
74
+ refs/tags/doubly-signed-tag
75
refs/tags/four
76
refs/tags/signed-tag
77
refs/tags/three
@@ -90,7 +90,7 @@ test_expect_success 'left alignment is default' '
90
refname is refs/heads/master |refs/heads/master
91
refname is refs/heads/side |refs/heads/side
92
refname is refs/odd/spot |refs/odd/spot
93
- refname is refs/tags/double-tag|refs/tags/double-tag
93
+ refname is refs/tags/doubly-signed-tag|refs/tags/doubly-signed-tag
94
refname is refs/tags/four |refs/tags/four
95
refname is refs/tags/one |refs/tags/one
96
refname is refs/tags/signed-tag|refs/tags/signed-tag
@@ -106,7 +106,7 @@ test_expect_success 'middle alignment' '
106
| refname is refs/heads/master |refs/heads/master
107
| refname is refs/heads/side |refs/heads/side
108
| refname is refs/odd/spot |refs/odd/spot
109
- |refname is refs/tags/double-tag|refs/tags/double-tag
109
+ |refname is refs/tags/doubly-signed-tag|refs/tags/doubly-signed-tag
110
| refname is refs/tags/four |refs/tags/four
111
| refname is refs/tags/one |refs/tags/one
112
|refname is refs/tags/signed-tag|refs/tags/signed-tag
@@ -122,7 +122,7 @@ test_expect_success 'right alignment' '
122
| refname is refs/heads/master|refs/heads/master
123
| refname is refs/heads/side|refs/heads/side
124
| refname is refs/odd/spot|refs/odd/spot
125
- |refname is refs/tags/double-tag|refs/tags/double-tag
125
+ |refname is refs/tags/doubly-signed-tag|refs/tags/doubly-signed-tag
126
| refname is refs/tags/four|refs/tags/four
127
| refname is refs/tags/one|refs/tags/one
128
|refname is refs/tags/signed-tag|refs/tags/signed-tag
@@ -137,7 +137,7 @@ cat >expect <<-\EOF
137
| refname is refs/heads/master |refs/heads/master
138
| refname is refs/heads/side |refs/heads/side
139
| refname is refs/odd/spot |refs/odd/spot
140
-| refname is refs/tags/double-tag |refs/tags/double-tag
140
+| refname is refs/tags/doubly-signed-tag |refs/tags/doubly-signed-tag
141
| refname is refs/tags/four |refs/tags/four
142
| refname is refs/tags/one |refs/tags/one
143
| refname is refs/tags/signed-tag |refs/tags/signed-tag
@@ -182,7 +182,7 @@ test_expect_success 'alignment with format quote' "
182
|' '\''master| A U Thor'\'' '|
183
|' '\''side| A U Thor'\'' '|
184
|' '\''odd/spot| A U Thor'\'' '|
185
- |' '\''double-tag| '\'' '|
185
+ |' '\''doubly-signed-tag| '\'' '|
186
|' '\''four| A U Thor'\'' '|
187
|' '\''one| A U Thor'\'' '|
188
|' '\''signed-tag| '\'' '|
@@ -198,7 +198,7 @@ test_expect_success 'nested alignment with quote formatting' "
198
|' master '|
199
|' side '|
200
|' odd/spot '|
201
- |' double-tag '|
201
+ |'doubly-signed-tag '|
202
|' four '|
203
|' one '|
204
|' signed-tag '|
@@ -214,10 +214,10 @@ test_expect_success 'check `%(contents:lines=1)`' '
214
master |three
215
side |four
216
odd/spot |three
217
- double-tag |Annonated doubly
217
+ doubly-signed-tag |Signed doubly
218
four |four
219
one |one
220
- signed-tag |A signed tag message
220
+ signed-tag |A signed tag
221
three |three
222
two |two
223
EOF
@@ -230,7 +230,7 @@ test_expect_success 'check `%(contents:lines=0)`' '
230
master |
231
side |
232
odd/spot |
233
- double-tag |
233
+ doubly-signed-tag |
234
four |
235
one |
236
signed-tag |
@@ -246,10 +246,10 @@ test_expect_success 'check `%(contents:lines=99999)`' '
246
master |three
247
side |four
248
odd/spot |three
249
- double-tag |Annonated doubly
249
+ doubly-signed-tag |Signed doubly
250
four |four
251
one |one
252
- signed-tag |A signed tag message
252
+ signed-tag |A signed tag
253
three |three
254
two |two
255
EOF