summaryrefslogtreecommitdiff
path: root/builtin/log.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2016-09-05 20:07:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-09-07 19:59:42 (GMT)
commitacad70d10687ce0fb269411e3a4b3b8fd11c6007 (patch)
tree757ad75d6c2811e60a2deac04fec44226fc3a98d /builtin/log.c
parent63ecb99e0d05bd4b73d14f439e489e70176fad43 (diff)
downloadgit-acad70d10687ce0fb269411e3a4b3b8fd11c6007.zip
git-acad70d10687ce0fb269411e3a4b3b8fd11c6007.tar.gz
git-acad70d10687ce0fb269411e3a4b3b8fd11c6007.tar.bz2
builtin: convert textconv_object to use struct object_id
Since all of its callers have been updated, make textconv_object take a struct object_id. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/log.c')
-rw-r--r--builtin/log.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c
index 226212c..48b9db5 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -479,7 +479,7 @@ static int show_blob_object(const struct object_id *oid, struct rev_info *rev, c
if (get_sha1_with_context(obj_name, 0, oidc.hash, &obj_context))
die(_("Not a valid object name %s"), obj_name);
if (!obj_context.path[0] ||
- !textconv_object(obj_context.path, obj_context.mode, oidc.hash, 1, &buf, &size))
+ !textconv_object(obj_context.path, obj_context.mode, &oidc, 1, &buf, &size))
return stream_blob_to_fd(1, oid->hash, NULL, 0);
if (!buf)