git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 3/4] t6302: also test annotated in addition to signed tags

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Mar 7, 2016, 00:10 UTC
Message-ID
<1457309427-30124-4-git-send-email-sunshine@sunshineco.com>
In-Reply-To
<1457309427-30124-1-git-send-email-sunshine@sunshineco.com>

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>
---

Due either to pragmatism or laziness, I plagiarized Junio's v1 review comment[1] for the commit message.

[1]: http://thread.gmane.org/gmane.comp.version-control.git/285170
 t/t6302-for-each-ref-filter.sh | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
diff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh
index 54a7387..2e28559 100755
--- a/t/t6302-for-each-ref-filter.sh
+++ b/t/t6302-for-each-ref-filter.sh
@@ -17,6 +17,8 @@ test_expect_success 'setup some history and refs' '
 	test_commit three &&
 	git checkout -b side &&
 	test_commit four &&
+	git tag -m "An annotated tag" annotated-tag &&
+	git tag -m "Annonated doubly" doubly-annotated-tag annotated-tag &&
 	git tag -s -m "A signed tag" signed-tag &&
 	git tag -s -m "Signed doubly" doubly-signed-tag signed-tag &&
 	git checkout master &&
@@ -36,6 +38,7 @@ test_expect_success 'filtering with --points-at' '
 test_expect_success 'check signed tags with --points-at' '
 	sed -e "s/Z$//" >expect <<-\EOF &&
 	refs/heads/side Z
+	refs/tags/annotated-tag four
 	refs/tags/four Z
 	refs/tags/signed-tag four
 	EOF
@@ -58,6 +61,8 @@ test_expect_success 'filtering with --merged' '
 test_expect_success 'filtering with --no-merged' '
 	cat >expect <<-\EOF &&
 	refs/heads/side
+	refs/tags/annotated-tag
+	refs/tags/doubly-annotated-tag
 	refs/tags/doubly-signed-tag
 	refs/tags/four
 	refs/tags/signed-tag
@@ -71,6 +76,8 @@ test_expect_success 'filtering with --contains' '
 	refs/heads/master
 	refs/heads/side
 	refs/odd/spot
+	refs/tags/annotated-tag
+	refs/tags/doubly-annotated-tag
 	refs/tags/doubly-signed-tag
 	refs/tags/four
 	refs/tags/signed-tag
@@ -90,6 +97,8 @@ 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/annotated-tag|refs/tags/annotated-tag
+	refname is refs/tags/doubly-annotated-tag|refs/tags/doubly-annotated-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
@@ -106,6 +115,8 @@ 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/annotated-tag|refs/tags/annotated-tag
+	|refname is refs/tags/doubly-annotated-tag|refs/tags/doubly-annotated-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
@@ -122,6 +133,8 @@ 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/annotated-tag|refs/tags/annotated-tag
+	|refname is refs/tags/doubly-annotated-tag|refs/tags/doubly-annotated-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
@@ -137,6 +150,8 @@ 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/annotated-tag    |refs/tags/annotated-tag
+|refname is refs/tags/doubly-annotated-tag |refs/tags/doubly-annotated-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
@@ -182,6 +197,8 @@ test_expect_success 'alignment with format quote' "
 	|'      '\''master| A U Thor'\''      '|
 	|'       '\''side| A U Thor'\''       '|
 	|'     '\''odd/spot| A U Thor'\''     '|
+	|'      '\''annotated-tag| '\''       '|
+	|'   '\''doubly-annotated-tag| '\''   '|
 	|'    '\''doubly-signed-tag| '\''     '|
 	|'       '\''four| A U Thor'\''       '|
 	|'       '\''one| A U Thor'\''        '|
@@ -198,6 +215,8 @@ test_expect_success 'nested alignment with quote formatting' "
 	|'         master               '|
 	|'           side               '|
 	|'       odd/spot               '|
+	|'  annotated-tag               '|
+	|'doubly-annotated-tag          '|
 	|'doubly-signed-tag             '|
 	|'           four               '|
 	|'            one               '|
@@ -214,6 +233,8 @@ test_expect_success 'check `%(contents:lines=1)`' '
 	master |three
 	side |four
 	odd/spot |three
+	annotated-tag |An annotated tag
+	doubly-annotated-tag |Annonated doubly
 	doubly-signed-tag |Signed doubly
 	four |four
 	one |one
@@ -230,6 +251,8 @@ test_expect_success 'check `%(contents:lines=0)`' '
 	master |
 	side |
 	odd/spot |
+	annotated-tag |
+	doubly-annotated-tag |
 	doubly-signed-tag |
 	four |
 	one |
@@ -246,6 +269,8 @@ test_expect_success 'check `%(contents:lines=99999)`' '
 	master |three
 	side |four
 	odd/spot |three
+	annotated-tag |An annotated tag
+	doubly-annotated-tag |Annonated doubly
 	doubly-signed-tag |Signed doubly
 	four |four
 	one |one

-- 
2.8.0.rc1.175.g19dcece
Previous: Eric SunshineNext: Eric Sunshine
Message 6 of 9 in “make t6302 usable even without GPG installed”
  1. 0/4 make t6302 usable even without GPG installedEric Sunshine, Mar 7, 2016
  2. 1/4 lib-gpg: drop unnecessary "missing GPG" warningEric Sunshine, Mar 7, 2016
  3. Johannes SchindelinMar 15, 2016
  4. Eric SunshineMar 15, 2016
  5. 2/4 t6302: normalize names and descriptions of signed tagsEric Sunshine, Mar 7, 2016
  6. 3/4 t6302: also test annotated in addition to signed tagsEric Sunshine, Mar 7, 2016
  7. 4/4 t6302: skip only signed tags rather than all tests when GPG is missingEric Sunshine, Mar 7, 2016
  8. Johannes SchindelinMar 15, 2016
  9. Eric SunshineMar 17, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.