Merge branch 'jc/test-must-be-empty'

diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c
index b775a756470ddc365907fae53dcc949bcaae7ca5..473615117e0adbb301e6ddc0ab000accc513a9ee 100644 (file)
--- a/builtin/diff-tree.c
+++ b/builtin/diff-tree.c
@@ -76,7 +76,7 @@ static int diff_tree_stdin(char *line)
        if (obj->type == OBJ_TREE)
                return stdin_diff_trees((struct tree *)obj, p);
        error("Object %s is a %s, not a commit or tree",
-             oid_to_hex(&oid), typename(obj->type));
+             oid_to_hex(&oid), type_name(obj->type));
        return -1;
 }