]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6d579a0 0571979)
Merge branch 'jk/list-tag-2.7-regression'
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Feb 2016 23:14:24 +0000 (15:14 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Feb 2016 23:14:24 +0000 (15:14 -0800)
commit8bad3de2c8390d952308652493fb72f58820895e
tree0ac093f7a1ea176a82b7de17e9b7c7198223fbf9tree | snapshot
parent6d579a0de63157b771958c30c0d8a28cfafa7574commit | diff
parent0571979bd60837d3c0802ecc1a47c48b4a6114d0commit | 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
Documentation/git-for-each-ref.txt diff1 | diff2 | blob | history
t/t7004-tag.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.