Skip to content

Commit

Permalink
t6302: normalize names and descriptions of signed tags
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eric Sunshine authored and Junio C Hamano committed Mar 7, 2016
1 parent f9e9c0d commit ef93c7d
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions t/t6302-for-each-ref-filter.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ test_expect_success 'setup some history and refs' '
test_commit three &&
git checkout -b side &&
test_commit four &&
git tag -s -m "A signed tag message" signed-tag &&
git tag -s -m "Annonated doubly" double-tag signed-tag &&
git tag -s -m "A signed tag" signed-tag &&
git tag -s -m "Signed doubly" doubly-signed-tag signed-tag &&
git checkout master &&
git update-ref refs/odd/spot master
'
Expand Down Expand Up @@ -58,7 +58,7 @@ test_expect_success 'filtering with --merged' '
test_expect_success 'filtering with --no-merged' '
cat >expect <<-\EOF &&
refs/heads/side
refs/tags/double-tag
refs/tags/doubly-signed-tag
refs/tags/four
refs/tags/signed-tag
EOF
Expand All @@ -71,7 +71,7 @@ test_expect_success 'filtering with --contains' '
refs/heads/master
refs/heads/side
refs/odd/spot
refs/tags/double-tag
refs/tags/doubly-signed-tag
refs/tags/four
refs/tags/signed-tag
refs/tags/three
Expand All @@ -90,7 +90,7 @@ test_expect_success 'left alignment is default' '
refname is refs/heads/master |refs/heads/master
refname is refs/heads/side |refs/heads/side
refname is refs/odd/spot |refs/odd/spot
refname is refs/tags/double-tag|refs/tags/double-tag
refname is refs/tags/doubly-signed-tag|refs/tags/doubly-signed-tag
refname is refs/tags/four |refs/tags/four
refname is refs/tags/one |refs/tags/one
refname is refs/tags/signed-tag|refs/tags/signed-tag
Expand All @@ -106,7 +106,7 @@ test_expect_success 'middle alignment' '
| refname is refs/heads/master |refs/heads/master
| refname is refs/heads/side |refs/heads/side
| refname is refs/odd/spot |refs/odd/spot
|refname is refs/tags/double-tag|refs/tags/double-tag
|refname is refs/tags/doubly-signed-tag|refs/tags/doubly-signed-tag
| refname is refs/tags/four |refs/tags/four
| refname is refs/tags/one |refs/tags/one
|refname is refs/tags/signed-tag|refs/tags/signed-tag
Expand All @@ -122,7 +122,7 @@ test_expect_success 'right alignment' '
| refname is refs/heads/master|refs/heads/master
| refname is refs/heads/side|refs/heads/side
| refname is refs/odd/spot|refs/odd/spot
|refname is refs/tags/double-tag|refs/tags/double-tag
|refname is refs/tags/doubly-signed-tag|refs/tags/doubly-signed-tag
| refname is refs/tags/four|refs/tags/four
| refname is refs/tags/one|refs/tags/one
|refname is refs/tags/signed-tag|refs/tags/signed-tag
Expand All @@ -137,7 +137,7 @@ cat >expect <<-\EOF
| refname is refs/heads/master |refs/heads/master
| refname is refs/heads/side |refs/heads/side
| refname is refs/odd/spot |refs/odd/spot
| refname is refs/tags/double-tag |refs/tags/double-tag
| refname is refs/tags/doubly-signed-tag |refs/tags/doubly-signed-tag
| refname is refs/tags/four |refs/tags/four
| refname is refs/tags/one |refs/tags/one
| refname is refs/tags/signed-tag |refs/tags/signed-tag
Expand Down Expand Up @@ -182,7 +182,7 @@ test_expect_success 'alignment with format quote' "
|' '\''master| A U Thor'\'' '|
|' '\''side| A U Thor'\'' '|
|' '\''odd/spot| A U Thor'\'' '|
|' '\''double-tag| '\'' '|
|' '\''doubly-signed-tag| '\'' '|
|' '\''four| A U Thor'\'' '|
|' '\''one| A U Thor'\'' '|
|' '\''signed-tag| '\'' '|
Expand All @@ -198,7 +198,7 @@ test_expect_success 'nested alignment with quote formatting' "
|' master '|
|' side '|
|' odd/spot '|
|' double-tag '|
|'doubly-signed-tag '|
|' four '|
|' one '|
|' signed-tag '|
Expand All @@ -214,10 +214,10 @@ test_expect_success 'check `%(contents:lines=1)`' '
master |three
side |four
odd/spot |three
double-tag |Annonated doubly
doubly-signed-tag |Signed doubly
four |four
one |one
signed-tag |A signed tag message
signed-tag |A signed tag
three |three
two |two
EOF
Expand All @@ -230,7 +230,7 @@ test_expect_success 'check `%(contents:lines=0)`' '
master |
side |
odd/spot |
double-tag |
doubly-signed-tag |
four |
one |
signed-tag |
Expand All @@ -246,10 +246,10 @@ test_expect_success 'check `%(contents:lines=99999)`' '
master |three
side |four
odd/spot |three
double-tag |Annonated doubly
doubly-signed-tag |Signed doubly
four |four
one |one
signed-tag |A signed tag message
signed-tag |A signed tag
three |three
two |two
EOF
Expand Down

0 comments on commit ef93c7d

Please sign in to comment.