mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/list-tag-2.7-regression' into maint

Browse Source 
"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
This commit is contained in:
Junio C Hamano
2016-02-05 14:54:15 -08:00
parent 913c2c7c7b 0571979bd6
commit 88ec75dba4
7 changed files with 72 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/tag.c
View File

@ -44,11 +44,11 @@ static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting, con
if (!format) {
if (filter->lines) {
to_free = xstrfmt("%s %%(contents:lines=%d)",
"%(align:15)%(refname:short)%(end)",
"%(align:15)%(refname:strip=2)%(end)",
filter->lines);
format = to_free;
} else
format = "%(refname:short)";
format = "%(refname:strip=2)";
}
verify_ref_format(format);