Merge branch 'jk/strbuf-read-file-close-error'

diff --git a/object.h b/object.h
index 87563d90562b51859da8313b105a3e7785ed9d26..a5eb263808e8f1969a625578a22f33c0aff2ef0a 100644 (file)
--- a/object.h
+++ b/object.h
@@ -53,7 +53,7 @@ struct object {
        struct object_id oid;
 };
 
-extern const char *typename(unsigned int type);
+extern const char *type_name(unsigned int type);
 extern int type_from_string_gently(const char *str, ssize_t, int gentle);
 #define type_from_string(str) type_from_string_gently(str, -1, 0)