summaryrefslogtreecommitdiff
path: root/tree-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-04 00:23:36 -0700
committerJunio C Hamano <junkio@cox.net>2006-04-04 00:23:36 -0700
commit00cbdec981e186264dc2529edce31da4bcbd41f3 (patch)
treed1c0436f5087526442b6e35e619daf33c4ccde97 /tree-diff.c
parentb411fda15df4897a1308bbb5950088ea6138cbad (diff)
parent90321c106ca6e36c0e884ca677c9a52dea47bdde (diff)
downloadgit-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 'tree-diff.c')
-rw-r--r--tree-diff.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/tree-diff.c b/tree-diff.c
index 7bb6109111..701fbba65c 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;