From: Linus Torvalds Date: Mon, 2 May 2005 02:28:18 +0000 (-0700) Subject: Make "cat-file" use "read_object_with_reference()" X-Git-Tag: v0.99~668 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=11e7d5c594e79258f73c8c2a2e7e90dd60d05ce3;p=git.git Make "cat-file" use "read_object_with_reference()" This means that you can take a tag object, and do git-cat-file commit tagname and it will cat the commit that the tag points to. Or you can cat the tree that a commit (or tag) points to. It still gives the old behaviour if you just give it the original type, ie if you want to see the tag object itself, you'd do git-cat-file -t tagname and you'd get the expected tag output. --- diff --git a/cat-file.c b/cat-file.c index d253ff938..6bbb0ca01 100644 --- a/cat-file.c +++ b/cat-file.c @@ -14,18 +14,21 @@ int main(int argc, char **argv) if (argc != 3 || get_sha1(argv[2], sha1)) usage("cat-file [-t | tagname] "); - buf = read_sha1_file(sha1, type, &size); - if (!buf) - die("cat-file %s: bad file", argv[2]); + if (!strcmp("-t", argv[1])) { - buf = type; - size = strlen(type); - type[size] = '\n'; - size++; - } else if (strcmp(type, argv[1])) { - die("cat-file %s: bad tag", argv[2]); + buf = read_sha1_file(sha1, type, &size); + if (buf) { + buf = type; + size = strlen(type); + type[size] = '\n'; + } + } else { + buf = read_object_with_reference(sha1, argv[1], &size, NULL); } + if (!buf) + die("cat-file %s: bad file", argv[2]); + while (size > 0) { long ret = write(1, buf, size); if (ret < 0) {