summaryrefslogtreecommitdiff
path: root/submodule.c
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2018-02-14 18:59:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-14 21:10:05 (GMT)
commitdebca9d2fe784193dc2d9f98b5edac605ddfefbb (patch)
tree080b732db21d1233d150c64311b9a013fb6aa200 /submodule.c
parent6ca32f47145370b6c0d956d1f8568d7e0595f195 (diff)
downloadgit-debca9d2fe784193dc2d9f98b5edac605ddfefbb.zip
git-debca9d2fe784193dc2d9f98b5edac605ddfefbb.tar.gz
git-debca9d2fe784193dc2d9f98b5edac605ddfefbb.tar.bz2
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 <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.c')
-rw-r--r--submodule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/submodule.c b/submodule.c
index 47ddc9b..cd18400 100644
--- a/submodule.c
+++ b/submodule.c
@@ -831,7 +831,7 @@ static int check_has_commit(const struct object_id *oid, void *data)
return 0;
default:
die(_("submodule entry '%s' (%s) is a %s, not a commit"),
- cb->path, oid_to_hex(oid), typename(type));
+ cb->path, oid_to_hex(oid), type_name(type));
}
}