Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2018-02-14 21:59:24 +0300
committerJunio C Hamano <gitster@pobox.com>2018-02-15 00:10:05 +0300
commitdebca9d2fe784193dc2d9f98b5edac605ddfefbb (patch)
tree080b732db21d1233d150c64311b9a013fb6aa200 /builtin/diff-tree.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 <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/diff-tree.c')
-rw-r--r--builtin/diff-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c
index b775a75647..473615117e 100644
--- a/builtin/diff-tree.c
+++ b/builtin/diff-tree.c
@@ -76,7 +76,7 @@ static int diff_tree_stdin(char *line)
if (obj->type == OBJ_TREE)
return stdin_diff_trees((struct tree *)obj, p);
error("Object %s is a %s, not a commit or tree",
- oid_to_hex(&oid), typename(obj->type));
+ oid_to_hex(&oid), type_name(obj->type));
return -1;
}