commit: add short-circuit to paint_down_to_common()

diff --git a/builtin/merge.c b/builtin/merge.c
index 92ba99a1a5efff8598251c2ed806bae12832ae0a..5e5e4497e3f2406b6b17c3081d3174af46f9c112 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -520,7 +520,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
                if (desc && desc->obj && desc->obj->type == OBJ_TAG) {
                        strbuf_addf(msg, "%s\t\t%s '%s'\n",
                                    oid_to_hex(&desc->obj->oid),
-                                   typename(desc->obj->type),
+                                   type_name(desc->obj->type),
                                    remote);
                        goto cleanup;
                }