summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-02-01 23:14:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-02-01 23:14:24 (GMT)
commit8bad3de2c8390d952308652493fb72f58820895e (patch)
tree0ac093f7a1ea176a82b7de17e9b7c7198223fbf9 /builtin
parent6d579a0de63157b771958c30c0d8a28cfafa7574 (diff)
parent0571979bd60837d3c0802ecc1a47c48b4a6114d0 (diff)
downloadgit-8bad3de2c8390d952308652493fb72f58820895e.zip
git-8bad3de2c8390d952308652493fb72f58820895e.tar.gz
git-8bad3de2c8390d952308652493fb72f58820895e.tar.bz2
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
Diffstat (limited to 'builtin')
-rw-r--r--builtin/tag.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/tag.c b/builtin/tag.c
index 8db8c87..1705c94 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);