sha1_file: restore OBJECT_INFO_QUICK functionality

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 3345a0d16f21c38fe5fe6f32fa5b0a139e21c4a3..fc4f8fd2ea29c7c23d3b1c7ca0ba78824c255a91 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -1124,9 +1124,8 @@ static int checkout_branch(struct checkout_opts *opts,
 
        if (new->path && !opts->force_detach && !opts->new_branch &&
            !opts->ignore_other_worktrees) {
-               struct object_id oid;
                int flag;
-               char *head_ref = resolve_refdup("HEAD", 0, oid.hash, &flag);
+               char *head_ref = resolve_refdup("HEAD", 0, NULL, &flag);
                if (head_ref &&
                    (!(flag & REF_ISSYMREF) || strcmp(head_ref, new->path)))
                        die_if_checked_out(new->path, 1);
@@ -1298,6 +1297,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
                strbuf_release(&buf);
        }
 
+       UNLEAK(opts);
        if (opts.patch_mode || opts.pathspec.nr)
                return checkout_paths(&opts, new.name);
        else