Merge branch 'cc/perf-aggregate-unknown-option'

diff --git a/builtin/log.c b/builtin/log.c
index 71f68a3e4f59d987c653fb8f32a4d8770e9c6654..75f7ff044178f58b9302d3e9f767986195307d94 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1067,8 +1067,8 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
 
        diff_setup_done(&opts);
 
-       diff_tree_oid(&origin->tree->object.oid,
-                     &head->tree->object.oid,
+       diff_tree_oid(get_commit_tree_oid(origin),
+                     get_commit_tree_oid(head),
                      "", &opts);
        diffcore_std(&opts);
        diff_flush(&opts);