- if (argc != 2 || get_sha1_hex(argv[1], sha1))
- usage("cat-file: cat-file <sha1>");
- buf = read_sha1_file(sha1, type, &size);
+ if (argc != 3 || get_sha1(argv[2], sha1))
+ usage("git-cat-file [-t | tagname] <sha1>");
+
+ if (!strcmp("-t", argv[1])) {
+ buf = read_sha1_file(sha1, type, &size);
+ if (buf) {
+ buf = type;
+ size = strlen(type);
+ type[size] = '\n';
+ size++;
+ }
+ } else {
+ buf = read_object_with_reference(sha1, argv[1], &size, NULL);
+ }
+