Merge branch 'bw/c-plus-plus' into ds/lazy-load-trees

diff --git a/builtin/tag.c b/builtin/tag.c
index 8885e21ddc81e4d2686aaeb6fe4c1bbffc916ec1..7bc499b36e0d8111a843a8ad3f9e96b3fe2bd57b 100644 (file)
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -220,7 +220,7 @@ static void create_tag(const struct object_id *object, const char *tag,
                    "tag %s\n"
                    "tagger %s\n\n",
                    oid_to_hex(object),
-                   typename(type),
+                   type_name(type),
                    tag,
                    git_committer_info(IDENT_STRICT));