diff options
| author | Peter Eriksen <s022018@student.dtu.dk> | 2006-04-02 14:44:09 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-04 00:11:19 -0700 |
| commit | 8e4402592574d630cdb5ab4f55a1b7131802ff72 (patch) | |
| tree | 5891c240ca498628ae66b8a7069ad9b90f123a2b /tree-diff.c | |
| parent | fc9957b0052df6a8248420395bc9febd66194252 (diff) | |
| download | git-8e4402592574d630cdb5ab4f55a1b7131802ff72.tar.gz git-8e4402592574d630cdb5ab4f55a1b7131802ff72.tar.xz | |
Use blob_, commit_, tag_, and tree_type throughout.
This replaces occurences of "blob", "commit", "tag", and "tree",
where they're really used as type specifiers, which we already
have defined global constants for.
Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'tree-diff.c')
| -rw-r--r-- | tree-diff.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tree-diff.c b/tree-diff.c index 7bb610911..701fbba65 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -3,6 +3,7 @@ */ #include "cache.h" #include "diff.h" +#include "tree.h" // What paths are we interested in? static int nr_paths = 0; @@ -148,7 +149,7 @@ static int show_entry(struct diff_options *opt, const char *prefix, struct tree_ void *tree; tree = read_sha1_file(sha1, type, &inner.size); - if (!tree || strcmp(type, "tree")) + if (!tree || strcmp(type, tree_type)) die("corrupt tree sha %s", sha1_to_hex(sha1)); inner.buf = tree; @@ -206,10 +207,10 @@ int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const cha struct tree_desc t1, t2; int retval; - tree1 = read_object_with_reference(old, "tree", &t1.size, NULL); + tree1 = read_object_with_reference(old, tree_type, &t1.size, NULL); if (!tree1) die("unable to read source tree (%s)", sha1_to_hex(old)); - tree2 = read_object_with_reference(new, "tree", &t2.size, NULL); + tree2 = read_object_with_reference(new, tree_type, &t2.size, NULL); if (!tree2) die("unable to read destination tree (%s)", sha1_to_hex(new)); t1.buf = tree1; |