[PATCH] git bugfixes and cleanups, mainly Debian things

diff --git a/cat-file.c b/cat-file.c
index 85a5d4caedec271f6c5e71ec3d7337b33447f581..ef58970d82ae9d6e62ec43c496ac1677aedeee3f 100644 (file)
--- a/cat-file.c
+++ b/cat-file.c
@@ -13,10 +13,11 @@ int main(int argc, char **argv)
        unsigned long size;
 
        if (argc != 3 || get_sha1(argv[2], sha1))
-               usage("git-cat-file [-t | -s | tagname] <sha1>");
+               usage("git-cat-file [-t | -s | <type>] <sha1>");
 
        if (!strcmp("-t", argv[1]) || !strcmp("-s", argv[1])) {
-               if (!sha1_object_info(sha1, type, &size)) {
+               if (!sha1_object_info(sha1, type,
+                                     argv[1][1] == 's' ? &size : NULL)) {
                        switch (argv[1][1]) {
                        case 't':
                                printf("%s\n", type);