diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-05 14:54:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-05 14:54:15 -0800 |
| commit | 88ec75dba425be4a18309f28a8c5ae01044fd29a (patch) | |
| tree | 13ac7740a00e92c196a81c709b70eba4976d5a71 /builtin | |
| parent | 913c2c7c7be358144260bc81112e548d3276d694 (diff) | |
| parent | 0571979bd60837d3c0802ecc1a47c48b4a6114d0 (diff) | |
| download | git-88ec75dba425be4a18309f28a8c5ae01044fd29a.tar.gz git-88ec75dba425be4a18309f28a8c5ae01044fd29a.tar.xz | |
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
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/tag.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/tag.c b/builtin/tag.c index 8db8c87e5..1705c9466 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -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); |