Merge branch 'pw/rebase-i-regression-fix'

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index b75133f625c79b5452f93076161f89e62d8ad906..04b9dcaf0f4ca90712cbb85cace521e226194f3b 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -845,7 +845,8 @@ static void sha1_object(const void *data, struct object_entry *obj_entry,
                         * we do not need to free the memory here, as the
                         * buf is deleted by the caller.
                         */
-                       obj = parse_object_buffer(oid->hash, type, size, buf, &eaten);
+                       obj = parse_object_buffer(oid, type, size, buf,
+                                                 &eaten);
                        if (!obj)
                                die(_("invalid %s"), typename(type));
                        if (do_fsck_object &&