Merge branch 'bw/c-plus-plus'

diff --git a/sequencer.c b/sequencer.c
index a35a0e60b8035ad0a02962f0fc0f0791806a28c6..969755b7e0a39348af0962f576148af4b91438c8 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -2883,7 +2883,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);