path: root/builtin/mktree.c
diff options
authorBrandon Williams <>2018-02-14 18:59:24 (GMT)
committerJunio C Hamano <>2018-02-14 21:10:05 (GMT)
commitdebca9d2fe784193dc2d9f98b5edac605ddfefbb (patch)
tree080b732db21d1233d150c64311b9a013fb6aa200 /builtin/mktree.c
parent6ca32f47145370b6c0d956d1f8568d7e0595f195 (diff)
object: rename function 'typename' to 'type_name'
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'builtin/mktree.c')
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/mktree.c b/builtin/mktree.c
index da0fd8c..b7b1cb5 100644
--- a/builtin/mktree.c
+++ b/builtin/mktree.c
@@ -112,7 +112,7 @@ static void mktree_line(char *buf, size_t len, int nul_term_line, int allow_miss
mode_type = object_type(mode);
if (mode_type != type_from_string(ptr)) {
die("entry '%s' object type (%s) doesn't match mode type (%s)",
- path, ptr, typename(mode_type));
+ path, ptr, type_name(mode_type));
/* Check the type of object identified by sha1 */
@@ -131,7 +131,7 @@ static void mktree_line(char *buf, size_t len, int nul_term_line, int allow_miss
* because the new tree entry will never be correct.
die("entry '%s' object %s is a %s but specified type was (%s)",
- path, sha1_to_hex(sha1), typename(obj_type), typename(mode_type));
+ path, sha1_to_hex(sha1), type_name(obj_type), type_name(mode_type));