summaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2016-09-05 20:07:58 +0000
committerJunio C Hamano <gitster@pobox.com>2016-09-07 12:59:42 -0700
commitacad70d10687ce0fb269411e3a4b3b8fd11c6007 (patch)
tree757ad75d6c2811e60a2deac04fec44226fc3a98d /builtin.h
parent63ecb99e0d05bd4b73d14f439e489e70176fad43 (diff)
downloadgit-acad70d10687ce0fb269411e3a4b3b8fd11c6007.tar.gz
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.h')
-rw-r--r--builtin.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin.h b/builtin.h
index 6b95006a0a..b9122bc5f4 100644
--- a/builtin.h
+++ b/builtin.h
@@ -25,7 +25,7 @@ struct fmt_merge_msg_opts {
extern int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
struct fmt_merge_msg_opts *);
-extern int textconv_object(const char *path, unsigned mode, const unsigned char *sha1, int sha1_valid, char **buf, unsigned long *buf_size);
+extern int textconv_object(const char *path, unsigned mode, const struct object_id *oid, int oid_valid, char **buf, unsigned long *buf_size);
extern int is_builtin(const char *s);