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

diff --git a/builtin/diff.c b/builtin/diff.c
index 895f92897829f35cae26ab3e7eb7cfb9ac7884e6..8c03ddaf589bbdce723b00a9d911673b064bd13e 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -395,7 +395,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
                const char *name = entry->name;
                int flags = (obj->flags & UNINTERESTING);
                if (!obj->parsed)
-                       obj = parse_object(obj->oid.hash);
+                       obj = parse_object(&obj->oid);
                obj = deref_tag(obj, NULL, 0);
                if (!obj)
                        die(_("invalid object '%s' given."), name);