diff options
| author | Brandon Williams <bmwill@google.com> | 2017-05-30 17:31:03 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-05 02:23:58 (GMT) |
| commit | 66f414f885aa6f44ae9e764bdd3e3cd7bd80c5a3 (patch) | |
| tree | 93238d8cef2a91c8792e591e2752bb1971543581 /builtin/merge.c | |
| parent | 9e5e0c289a900186b8943741cc632ea3bb6e1510 (diff) | |
| download | git-66f414f885aa6f44ae9e764bdd3e3cd7bd80c5a3.zip git-66f414f885aa6f44ae9e764bdd3e3cd7bd80c5a3.tar.gz git-66f414f885aa6f44ae9e764bdd3e3cd7bd80c5a3.tar.bz2 | |
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/merge.c')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index a4a098f..afaed6a 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -415,7 +415,7 @@ static void finish(struct commit *head_commit, DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT; opts.detect_rename = DIFF_DETECT_RENAME; diff_setup_done(&opts); - diff_tree_sha1(head->hash, new_head->hash, "", &opts); + diff_tree_oid(head, new_head, "", &opts); diffcore_std(&opts); diff_flush(&opts); } |