diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-12-18 15:35:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-18 15:35:01 -0800 |
| commit | 252f922b1919db3bcfdc07bbedff7d3c42172959 (patch) | |
| tree | b85686e7a601ddffbe9f43a6b824dadaf77220bc /t | |
| parent | Sync with 'maint' (diff) | |
| parent | t7004: do not create unneeded gpghome/gpg.conf when GPG is not used (diff) | |
| download | tgif-252f922b1919db3bcfdc07bbedff7d3c42172959.tar.xz | |
Merge branch 'maint'
* maint:
t7004: do not create unneeded gpghome/gpg.conf when GPG is not used
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7004-tag.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index 5189446534..f5a79b13ae 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -1066,12 +1066,12 @@ test_expect_success GPG \ ' # usage with rfc1991 signatures -echo "rfc1991" > gpghome/gpg.conf get_tag_header rfc1991-signed-tag $commit commit $time >expect echo "RFC1991 signed tag" >>expect echo '-----BEGIN PGP MESSAGE-----' >>expect test_expect_success GPG \ 'creating a signed tag with rfc1991' ' + echo "rfc1991" >gpghome/gpg.conf && git tag -s -m "RFC1991 signed tag" rfc1991-signed-tag $commit && get_tag_msg rfc1991-signed-tag >actual && test_cmp expect actual @@ -1085,6 +1085,7 @@ chmod +x fakeeditor test_expect_success GPG \ 'reediting a signed tag body omits signature' ' + echo "rfc1991" >gpghome/gpg.conf && echo "RFC1991 signed tag" >expect && GIT_EDITOR=./fakeeditor git tag -f -s rfc1991-signed-tag $commit && test_cmp expect actual @@ -1092,11 +1093,13 @@ test_expect_success GPG \ test_expect_success GPG \ 'verifying rfc1991 signature' ' + echo "rfc1991" >gpghome/gpg.conf && git tag -v rfc1991-signed-tag ' test_expect_success GPG \ 'list tag with rfc1991 signature' ' + echo "rfc1991" >gpghome/gpg.conf && echo "rfc1991-signed-tag RFC1991 signed tag" >expect && git tag -l -n1 rfc1991-signed-tag >actual && test_cmp expect actual && |