aboutsummaryrefslogtreecommitdiff
path: root/cat-file.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-01 19:28:18 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-01 19:28:18 -0700
commit11e7d5c594e79258f73c8c2a2e7e90dd60d05ce3 (patch)
treee927e88c2b2e7d27d32e473ecba1339f54c8513c /cat-file.c
parentca4c7db9ef0e3ea95a768defeeaa7bea0f0b3dc6 (diff)
downloadgit-11e7d5c594e79258f73c8c2a2e7e90dd60d05ce3.tar.gz
git-11e7d5c594e79258f73c8c2a2e7e90dd60d05ce3.tar.xz
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.c21
1 files changed, 12 insertions, 9 deletions
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] <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) {