merge with /dev/null as base, instead of punting O==empty case

diff --git a/cat-file.c b/cat-file.c
index fa0bb722a2455fd4274f61e800cd9f5a764dda1e..d775a1545beb84caf05cae8980fb2d839240fdea 100644 (file)
--- a/cat-file.c
+++ b/cat-file.c
@@ -12,8 +12,9 @@ int main(int argc, char **argv)
        void *buf;
        unsigned long size;
 
+       setup_git_directory();
        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,