Merge branch 'ml/filter-branch-no-op-error'

diff --git a/builtin/verify-commit.c b/builtin/verify-commit.c
index ba38ac9b1518884693e2c89ec19cc9e00fce9fa3..05315ea7c966d3ed5b91e4cbd77eaa9943af253d 100644 (file)
--- a/builtin/verify-commit.c
+++ b/builtin/verify-commit.c
@@ -49,7 +49,7 @@ static int verify_commit(const char *name, unsigned flags)
                return error("%s: unable to read file.", name);
        if (type != OBJ_COMMIT)
                return error("%s: cannot verify a non-commit object of type %s.",
-                               name, typename(type));
+                               name, type_name(type));
 
        ret = run_gpg_verify(&oid, buf, size, flags);