l10n: git.pot: v1.8.3 round 1 (54 new, 15 removed)

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 512072a008560430fed86de9beb06c47f2587378..40f87b4649aa97ca1f33a02f09f5938ce5f41f74 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;
@@ -193,7 +193,7 @@ static int batch_one_object(const char *obj_name, int print_contents)
        unsigned char sha1[20];
        enum object_type type = 0;
        unsigned long size;
-       void *contents = contents;
+       void *contents = NULL;
 
        if (!obj_name)
           return 1;