diff options
author | Brandon Williams <bmwill@google.com> | 2017-05-30 10:31:03 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-06-05 11:23:58 +0900 |
commit | 66f414f885aa6f44ae9e764bdd3e3cd7bd80c5a3 (patch) | |
tree | 93238d8cef2a91c8792e591e2752bb1971543581 /builtin/diff-tree.c | |
parent | notes-merge: convert write_note_to_worktree to struct object_id (diff) | |
download | tgif-66f414f885aa6f44ae9e764bdd3e3cd7bd80c5a3.tar.xz |
diff-tree: convert diff_tree_sha1 to struct object_id
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/diff-tree.c')
-rw-r--r-- | builtin/diff-tree.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c index 5ea1c14317..aef1676198 100644 --- a/builtin/diff-tree.c +++ b/builtin/diff-tree.c @@ -49,8 +49,8 @@ static int stdin_diff_trees(struct tree *tree1, const char *p) return -1; printf("%s %s\n", oid_to_hex(&tree1->object.oid), oid_to_hex(&tree2->object.oid)); - diff_tree_sha1(tree1->object.oid.hash, tree2->object.oid.hash, - "", &log_tree_opt.diffopt); + diff_tree_oid(&tree1->object.oid, &tree2->object.oid, + "", &log_tree_opt.diffopt); log_tree_diff_flush(&log_tree_opt); return 0; } @@ -148,9 +148,7 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix) if (tree2->flags & UNINTERESTING) { SWAP(tree2, tree1); } - diff_tree_sha1(tree1->oid.hash, - tree2->oid.hash, - "", &opt->diffopt); + diff_tree_oid(&tree1->oid, &tree2->oid, "", &opt->diffopt); log_tree_diff_flush(opt); break; } |