| commit | 88ec75dba425be4a18309f28a8c5ae01044fd29a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Feb 2016 22:54:15 +0000 (5 14:54 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Feb 2016 22:54:15 +0000 (5 14:54 -0800) | ||
| tree | 13ac7740a00e92c196a81c709b70eba4976d5a71 | treesnapshot (tar.gz zip) |
| parent | 913c2c7c7be358144260bc81112e548d3276d694 | commitdiff |
| parent | 0571979bd60837d3c0802ecc1a47c48b4a6114d0 | commitdiff |
Merge branch 'jk/list-tag-2.7-regression' into maint
"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
"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