diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-04 00:23:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-04 00:23:36 -0700 |
| commit | 00cbdec981e186264dc2529edce31da4bcbd41f3 (patch) | |
| tree | d1c0436f5087526442b6e35e619daf33c4ccde97 /cat-file.c | |
| parent | b411fda15df4897a1308bbb5950088ea6138cbad (diff) | |
| parent | 90321c106ca6e36c0e884ca677c9a52dea47bdde (diff) | |
| download | git-00cbdec981e186264dc2529edce31da4bcbd41f3.tar.gz | |
Merge branch 'pe/cleanup' into next
* pe/cleanup:
Replace xmalloc+memset(0) with xcalloc.
Use blob_, commit_, tag_, and tree_type throughout.
Diffstat (limited to 'cat-file.c')
| -rw-r--r-- | cat-file.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cat-file.c b/cat-file.c index 761111eb0f..628f6cada8 100644 --- a/cat-file.c +++ b/cat-file.c @@ -5,6 +5,8 @@ */ #include "cache.h" #include "exec_cmd.h" +#include "tag.h" +#include "tree.h" static void flush_buffer(const char *buf, unsigned long size) { @@ -136,13 +138,13 @@ int main(int argc, char **argv) die("Not a valid object name %s", argv[2]); /* custom pretty-print here */ - if (!strcmp(type, "tree")) + if (!strcmp(type, tree_type)) return execl_git_cmd("ls-tree", argv[2], NULL); buf = read_sha1_file(sha1, type, &size); if (!buf) die("Cannot read object %s", argv[2]); - if (!strcmp(type, "tag")) + if (!strcmp(type, tag_type)) return pprint_tag(sha1, buf, size); /* otherwise just spit out the data */ |