merge: remove drop_save() in favor of remove_merge_branch_state()

diff --git a/builtin/reflog.c b/builtin/reflog.c
index 1f1010e2d9aec2b95487007ec30509fcbda605d6..4d3430900d06d82e8e06441f8fdfea00f7aecf78 100644 (file)
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -94,7 +94,7 @@ static int tree_is_complete(const struct object_id *oid)
        init_tree_desc(&desc, tree->buffer, tree->size);
        complete = 1;
        while (tree_entry(&desc, &entry)) {
-               if (!has_sha1_file(entry.oid.hash) ||
+               if (!has_object_file(&entry.oid) ||
                    (S_ISDIR(entry.mode) && !tree_is_complete(&entry.oid))) {
                        tree->object.flags |= INCOMPLETE;
                        complete = 0;