diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-12 22:42:06 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-12 22:42:06 -0800 |
| commit | 1efb73322ad800cc679496124e8a1f498b52e5cb (patch) | |
| tree | 4109d478cb4f7fa695bcebe4223dc402af4f49fc /t/t7004-tag.sh | |
| parent | 8c18a6f3fa0b1be98896a6c55c9e56595fbd3f41 (diff) | |
| parent | 31fd8d72f2eb82c2b6d8d450ee4e13a3925291c3 (diff) | |
| download | git-1efb73322ad800cc679496124e8a1f498b52e5cb.tar.gz git-1efb73322ad800cc679496124e8a1f498b52e5cb.tar.xz | |
Merge branch 'jk/maint-tag-show-fixes'
* jk/maint-tag-show-fixes:
tag: do not show non-tag contents with "-n"
tag: die when listing missing or corrupt objects
tag: fix output of "tag -n" when errors occur
Conflicts:
t/t7004-tag.sh
Diffstat (limited to 't/t7004-tag.sh')
| -rwxr-xr-x | t/t7004-tag.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index e93ac7382..4ef79aabc 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -586,6 +586,19 @@ test_expect_success \ test_cmp expect actual ' +test_expect_success 'annotations for blobs are empty' ' + blob=$(git hash-object -w --stdin <<-\EOF + Blob paragraph 1. + + Blob paragraph 2. + EOF + ) && + git tag tag-blob $blob && + echo "tag-blob " >expect && + git tag -n1 -l tag-blob >actual && + test_cmp expect actual +' + # trying to verify annotated non-signed tags: test_expect_success GPG \ |