diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2015-11-10 02:22:28 +0000 |
|---|---|---|
| committer |  Jeff King <peff@peff.net> | 2015-11-20 08:02:05 -0500 |
| commit | f2fd0760f62e79609fef7bfd7ecebb002e8e4ced (patch) | |
| tree | 1f915114b015428730e95a89697783560b672008 /builtin/diff-tree.c | |
| parent | Add several uses of get_object_hash. (diff) | |
| download | tgif-f2fd0760f62e79609fef7bfd7ecebb002e8e4ced.tar.xz | |
Convert struct object to object_id
struct object is one of the major data structures dealing with object
IDs. Convert it to use struct object_id instead of an unsigned char
array. Convert get_object_hash to refer to the new member as well.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'builtin/diff-tree.c')
| -rw-r--r-- | builtin/diff-tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c index cf7e9604b3..6fef266ea3 100644 --- a/builtin/diff-tree.c +++ b/builtin/diff-tree.c @@ -49,8 +49,8 @@ static int stdin_diff_trees(struct tree *tree1, char *line, int len) tree2 = lookup_tree(sha1); if (!tree2 || parse_tree(tree2)) return -1; - printf("%s %s\n", sha1_to_hex(tree1->object.sha1), - sha1_to_hex(tree2->object.sha1)); + printf("%s %s\n", oid_to_hex(&tree1->object.oid), + oid_to_hex(&tree2->object.oid)); diff_tree_sha1(get_object_hash(tree1->object), get_object_hash(tree2->object), "", &log_tree_opt.diffopt); log_tree_diff_flush(&log_tree_opt); |