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 /builtin/merge.c | |
| parent | object_info: change member name from 'typename' to 'type_name' (diff) | |
| download | tgif-debca9d2fe784193dc2d9f98b5edac605ddfefbb.tar.xz | |
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 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 30264cfd7c..9dec140960 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -520,7 +520,7 @@ static void merge_name(const char *remote, struct strbuf *msg) if (desc && desc->obj && desc->obj->type == OBJ_TAG) { strbuf_addf(msg, "%s\t\t%s '%s'\n", oid_to_hex(&desc->obj->oid), - typename(desc->obj->type), + type_name(desc->obj->type), remote); goto cleanup; } |