diff options
| author | Brandon Williams <bmwill@google.com> | 2018-02-14 10:59:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-14 13:10:05 -0800 |
| commit | debca9d2fe784193dc2d9f98b5edac605ddfefbb (patch) | |
| tree | 080b732db21d1233d150c64311b9a013fb6aa200 /log-tree.c | |
| parent | object_info: change member name from 'typename' to 'type_name' (diff) | |
| download | git-debca9d2fe784193dc2d9f98b5edac605ddfefbb.tar.gz git-debca9d2fe784193dc2d9f98b5edac605ddfefbb.zip | |
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 'log-tree.c')
| -rw-r--r-- | log-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/log-tree.c b/log-tree.c index fca29d4799..2eeddbeb35 100644 --- a/log-tree.c +++ b/log-tree.c @@ -499,7 +499,7 @@ static void show_one_mergetag(struct commit *commit, int status, nth; size_t payload_size, gpg_message_offset; - hash_sha1_file(extra->value, extra->len, typename(OBJ_TAG), oid.hash); + hash_sha1_file(extra->value, extra->len, type_name(OBJ_TAG), oid.hash); tag = lookup_tag(&oid); if (!tag) return; /* error message already given */ |