diff options
author | Junio C Hamano <junkio@cox.net> | 2006-04-04 13:43:00 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-04-04 13:43:00 -0700 |
commit | 810e1523753553968aac827f57e0e24fc9af6546 (patch) | |
tree | 47ec02a8c4a16c1f04e79e10a9b47cbcdfe4f564 /diff-tree.c | |
parent | Merge branch 'lt/fix-sol-pack' (diff) | |
parent | Replace xmalloc+memset(0) with xcalloc. (diff) | |
download | tgif-810e1523753553968aac827f57e0e24fc9af6546.tar.xz |
Merge branch 'pe/cleanup'
* pe/cleanup:
Replace xmalloc+memset(0) with xcalloc.
Use blob_, commit_, tag_, and tree_type throughout.
Diffstat (limited to 'diff-tree.c')
-rw-r--r-- | diff-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-tree.c b/diff-tree.c index f55a35a9d5..d1265d7963 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -52,7 +52,7 @@ static int diff_root_tree(const unsigned char *new, const char *base) void *tree; struct tree_desc empty, real; - tree = read_object_with_reference(new, "tree", &real.size, NULL); + tree = read_object_with_reference(new, tree_type, &real.size, NULL); if (!tree) die("unable to read root tree (%s)", sha1_to_hex(new)); real.buf = tree; |