Merge branch 'maint-1.8.1' into maint

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 00528ddc389212f045a7718ba55a26d723927f06..ad290007363120062b044ecb47cf976dbe118384 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -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;
 
        if (!obj_name)
           return 1;