Merge branch 'jt/submodule-pull-recurse-rebase'

diff --git a/builtin/reflog.c b/builtin/reflog.c
index 4719a5354cf182eb91b257a99da97b9b81da5257..a48984d37e4f5f9e1f07a840582f82e202bd09f0 100644 (file)
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -75,7 +75,7 @@ static int tree_is_complete(const struct object_id *oid)
        if (!tree->buffer) {
                enum object_type type;
                unsigned long size;
-               void *data = read_sha1_file(oid->hash, &type, &size);
+               void *data = read_object_file(oid, &type, &size);
                if (!data) {
                        tree->object.flags |= INCOMPLETE;
                        return 0;
@@ -154,7 +154,7 @@ static int commit_is_complete(struct commit *commit)
                for (i = 0; i < found.nr; i++) {
                        struct commit *c =
                                (struct commit *)found.objects[i].item;
-                       if (!tree_is_complete(&c->tree->object.oid)) {
+                       if (!tree_is_complete(get_commit_tree_oid(c))) {
                                is_incomplete = 1;
                                c->object.flags |= INCOMPLETE;
                        }