Merge commit 'f9f6e2c' into nd/attr-match-optim-more

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 36a9104433e23422aab39b1912e998a7f54cd3f4..60568f9c39955e72e454c7d22b143d3e72a1a9a5 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -146,7 +146,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
                        die("git cat-file --textconv %s: <object> must be <sha1:path>",
                            obj_name);
 
-               if (!textconv_object(obj_context.path, obj_context.mode, sha1, &buf, &size))
+               if (!textconv_object(obj_context.path, obj_context.mode, sha1, 1, &buf, &size))
                        die("git cat-file --textconv: unable to run textconv on %s",
                            obj_name);
                break;