commit, status: use status_printf{,_ln,_more} helpers

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index cada5d22573a59baeee3db3f740932c9419ed9e1..94632dbdb400f9a2986d10f06dd16119ce1b4e54 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -121,7 +121,9 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
 
                /* custom pretty-print here */
                if (type == OBJ_TREE) {
-                       const char *ls_args[3] = {"ls-tree", obj_name, NULL};
+                       const char *ls_args[3] = { NULL };
+                       ls_args[0] =  "ls-tree";
+                       ls_args[1] =  obj_name;
                        return cmd_ls_tree(2, ls_args, NULL);
                }
 
@@ -141,7 +143,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, sha1, &buf, &size))
+               if (!textconv_object(obj_context.path, obj_context.mode, sha1, &buf, &size))
                        die("git cat-file --textconv: unable to run textconv on %s",
                            obj_name);
                break;