From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Feb 2016 22:54:15 +0000 (-0800)
Subject: Merge branch 'jk/list-tag-2.7-regression' into maint
X-Git-Tag: v2.7.1~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/88ec75dba425be4a18309f28a8c5ae01044fd29a

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

88ec75dba425be4a18309f28a8c5ae01044fd29a