Merge branch 'js/gitweb-raw-blob-link-in-history' into next

diff --git a/tree-diff.c b/tree-diff.c
index 2357f72899f8f47e497ffd1bb66a0d76d7dbe012..4bb93155bc6e0349156b21ad1287d573593a79d5 100644 (file)
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -421,9 +421,8 @@ static struct combine_diff_path *ll_diff_tree_paths(
         *   diff_tree_oid(parent, commit) )
         */
        for (i = 0; i < nparent; ++i)
-               tptree[i] = fill_tree_descriptor(&tp[i],
-                               parents_oid[i] ? parents_oid[i]->hash : NULL);
-       ttree = fill_tree_descriptor(&t, oid ? oid->hash : NULL);
+               tptree[i] = fill_tree_descriptor(&tp[i], parents_oid[i]);
+       ttree = fill_tree_descriptor(&t, oid);
 
        /* Enable recursion indefinitely */
        opt->pathspec.recursive = DIFF_OPT_TST(opt, RECURSIVE);