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

diff --git a/sequencer.c b/sequencer.c
index e9baaf59bd954279970367631c930fe051712cda..6ca4499d23e74d745ee49bec0012df984bf09ec9 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -2870,7 +2870,7 @@ int sequencer_pick_revisions(struct replay_opts *opts)
                        if (!lookup_commit_reference_gently(&oid, 1)) {
                                enum object_type type = sha1_object_info(oid.hash, NULL);
                                return error(_("%s: can't cherry-pick a %s"),
-                                       name, typename(type));
+                                       name, type_name(type));
                        }
                } else
                        return error(_("%s: bad revision"), name);