summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2018-02-14 18:59:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-14 21:10:05 (GMT)
commit6ca32f47145370b6c0d956d1f8568d7e0595f195 (patch)
tree6da62e2115f422c6df36b599aeb4607adb93616f /builtin
parent5be1f00a9a701532232f57958efab4be8c959a29 (diff)
downloadgit-6ca32f47145370b6c0d956d1f8568d7e0595f195.zip
git-6ca32f47145370b6c0d956d1f8568d7e0595f195.tar.gz
git-6ca32f47145370b6c0d956d1f8568d7e0595f195.tar.bz2
object_info: change member name from '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')
-rw-r--r--builtin/cat-file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index f5fa4fd..d06c66c 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -76,7 +76,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
buf = NULL;
switch (opt) {
case 't':
- oi.typename = &sb;
+ oi.type_name = &sb;
if (sha1_object_info_extended(oid.hash, &oi, flags) < 0)
die("git cat-file: could not get object info");
if (sb.len) {