From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Feb 2016 23:14:24 +0000 (-0800)
Subject: Merge branch 'jk/list-tag-2.7-regression'
X-Git-Tag: v2.8.0-rc0~87
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8bad3de2c8390d952308652493fb72f58820895e

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

8bad3de2c8390d952308652493fb72f58820895e