Merge branch 'ma/bisect-leakfix'

diff --git a/combine-diff.c b/combine-diff.c
index 23f3d25e2af1d64ae32f84ffd6bccd700fd7ba1b..2505de119a2be37e9dfb313a2e44db68595ad13f 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1014,7 +1014,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
                        elem->mode = canon_mode(st.st_mode);
                } else if (S_ISDIR(st.st_mode)) {
                        struct object_id oid;
-                       if (resolve_gitlink_ref(elem->path, "HEAD", oid.hash) < 0)
+                       if (resolve_gitlink_ref(elem->path, "HEAD", &oid) < 0)
                                result = grab_blob(&elem->oid, elem->mode,
                                                   &result_size, NULL, NULL);
                        else