Merge branch 'en/incl-forward-decl'

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 08dced261420df86e6051928c0fbbdceafe64a75..64ec1745ab2c20ef18a9292ef3b3c82efd46de17 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -40,7 +40,7 @@ static int filter_object(const char *path, unsigned mode,
                             oid_to_hex(oid), path);
        if ((type == OBJ_BLOB) && S_ISREG(mode)) {
                struct strbuf strbuf = STRBUF_INIT;
-               if (convert_to_working_tree(path, *buf, *size, &strbuf)) {
+               if (convert_to_working_tree(&the_index, path, *buf, *size, &strbuf)) {
                        free(*buf);
                        *size = strbuf.len;
                        *buf = strbuf_detach(&strbuf, NULL);