diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-02 02:28:18 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-02 02:28:18 (GMT) |
commit | 11e7d5c594e79258f73c8c2a2e7e90dd60d05ce3 (patch) | |
tree | e927e88c2b2e7d27d32e473ecba1339f54c8513c /cat-file.c | |
parent | ca4c7db9ef0e3ea95a768defeeaa7bea0f0b3dc6 (diff) | |
download | git-11e7d5c594e79258f73c8c2a2e7e90dd60d05ce3.zip git-11e7d5c594e79258f73c8c2a2e7e90dd60d05ce3.tar.gz git-11e7d5c594e79258f73c8c2a2e7e90dd60d05ce3.tar.bz2 |
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.
Diffstat (limited to 'cat-file.c')
-rw-r--r-- | cat-file.c | 21 |
1 files changed, 12 insertions, 9 deletions
@@ -14,18 +14,21 @@ int main(int argc, char **argv) if (argc != 3 || get_sha1(argv[2], sha1)) usage("cat-file [-t | tagname] <sha1>"); - 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) { |