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 /diff-tree.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 '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; |