diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-02 02:14:24 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-02 02:14:24 +0300 |
| commit | 8bad3de2c8390d952308652493fb72f58820895e (patch) | |
| tree | 0ac093f7a1ea176a82b7de17e9b7c7198223fbf9 /t/t7004-tag.sh | |
| parent | 6d579a0de63157b771958c30c0d8a28cfafa7574 (diff) | |
| parent | 0571979bd60837d3c0802ecc1a47c48b4a6114d0 (diff) | |
Merge branch 'jk/list-tag-2.7-regression'
"git tag" started listing a tag "foo" as "tags/foo" when a branch
named "foo" exists in the same repository; remove this unnecessary
disambiguation, which is a regression introduced in v2.7.0.
* jk/list-tag-2.7-regression:
tag: do not show ambiguous tag names as "tags/foo"
t6300: use test_atom for some un-modern tests
Diffstat (limited to 't/t7004-tag.sh')
| -rwxr-xr-x | t/t7004-tag.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index 2797f22530..cf3469b142 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -1558,4 +1558,12 @@ test_expect_success '--no-merged show unmerged tags' ' test_cmp expect actual ' +test_expect_success 'ambiguous branch/tags not marked' ' + git tag ambiguous && + git branch ambiguous && + echo ambiguous >expect && + git tag -l ambiguous >actual && + test_cmp expect actual +' + test_done |