Skip to content

Commit

Permalink
Make "cat-file" use "read_object_with_reference()"
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Linus Torvalds committed May 2, 2005
1 parent ca4c7db commit 11e7d5c
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions cat-file.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 11e7d5c

Please sign in to comment.