Skip to content

Commit ef93c7d

Browse files
sunshinecogitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent f9e9c0d commit ef93c7d

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

t/t6302-for-each-ref-filter.sh

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ test_expect_success 'setup some history and refs' '
1717
test_commit three &&
1818
git checkout -b side &&
1919
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 &&
2222
git checkout master &&
2323
git update-ref refs/odd/spot master
2424
'
@@ -58,7 +58,7 @@ test_expect_success 'filtering with --merged' '
5858
test_expect_success 'filtering with --no-merged' '
5959
cat >expect <<-\EOF &&
6060
refs/heads/side
61-
refs/tags/double-tag
61+
refs/tags/doubly-signed-tag
6262
refs/tags/four
6363
refs/tags/signed-tag
6464
EOF
@@ -71,7 +71,7 @@ test_expect_success 'filtering with --contains' '
7171
refs/heads/master
7272
refs/heads/side
7373
refs/odd/spot
74-
refs/tags/double-tag
74+
refs/tags/doubly-signed-tag
7575
refs/tags/four
7676
refs/tags/signed-tag
7777
refs/tags/three
@@ -90,7 +90,7 @@ test_expect_success 'left alignment is default' '
9090
refname is refs/heads/master |refs/heads/master
9191
refname is refs/heads/side |refs/heads/side
9292
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
9494
refname is refs/tags/four |refs/tags/four
9595
refname is refs/tags/one |refs/tags/one
9696
refname is refs/tags/signed-tag|refs/tags/signed-tag
@@ -106,7 +106,7 @@ test_expect_success 'middle alignment' '
106106
| refname is refs/heads/master |refs/heads/master
107107
| refname is refs/heads/side |refs/heads/side
108108
| 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
110110
| refname is refs/tags/four |refs/tags/four
111111
| refname is refs/tags/one |refs/tags/one
112112
|refname is refs/tags/signed-tag|refs/tags/signed-tag
@@ -122,7 +122,7 @@ test_expect_success 'right alignment' '
122122
| refname is refs/heads/master|refs/heads/master
123123
| refname is refs/heads/side|refs/heads/side
124124
| 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
126126
| refname is refs/tags/four|refs/tags/four
127127
| refname is refs/tags/one|refs/tags/one
128128
|refname is refs/tags/signed-tag|refs/tags/signed-tag
@@ -137,7 +137,7 @@ cat >expect <<-\EOF
137137
| refname is refs/heads/master |refs/heads/master
138138
| refname is refs/heads/side |refs/heads/side
139139
| 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
141141
| refname is refs/tags/four |refs/tags/four
142142
| refname is refs/tags/one |refs/tags/one
143143
| refname is refs/tags/signed-tag |refs/tags/signed-tag
@@ -182,7 +182,7 @@ test_expect_success 'alignment with format quote' "
182182
|' '\''master| A U Thor'\'' '|
183183
|' '\''side| A U Thor'\'' '|
184184
|' '\''odd/spot| A U Thor'\'' '|
185-
|' '\''double-tag| '\'' '|
185+
|' '\''doubly-signed-tag| '\'' '|
186186
|' '\''four| A U Thor'\'' '|
187187
|' '\''one| A U Thor'\'' '|
188188
|' '\''signed-tag| '\'' '|
@@ -198,7 +198,7 @@ test_expect_success 'nested alignment with quote formatting' "
198198
|' master '|
199199
|' side '|
200200
|' odd/spot '|
201-
|' double-tag '|
201+
|'doubly-signed-tag '|
202202
|' four '|
203203
|' one '|
204204
|' signed-tag '|
@@ -214,10 +214,10 @@ test_expect_success 'check `%(contents:lines=1)`' '
214214
master |three
215215
side |four
216216
odd/spot |three
217-
double-tag |Annonated doubly
217+
doubly-signed-tag |Signed doubly
218218
four |four
219219
one |one
220-
signed-tag |A signed tag message
220+
signed-tag |A signed tag
221221
three |three
222222
two |two
223223
EOF
@@ -230,7 +230,7 @@ test_expect_success 'check `%(contents:lines=0)`' '
230230
master |
231231
side |
232232
odd/spot |
233-
double-tag |
233+
doubly-signed-tag |
234234
four |
235235
one |
236236
signed-tag |
@@ -246,10 +246,10 @@ test_expect_success 'check `%(contents:lines=99999)`' '
246246
master |three
247247
side |four
248248
odd/spot |three
249-
double-tag |Annonated doubly
249+
doubly-signed-tag |Signed doubly
250250
four |four
251251
one |one
252-
signed-tag |A signed tag message
252+
signed-tag |A signed tag
253253
three |three
254254
two |two
255255
EOF

0 commit comments

Comments
 (0)