Merge commit 'v1.7.0' into jc/checkout-reflog-fix

[git.git] / builtin-checkout.c

diff --git a/builtin-checkout.c b/builtin-checkout.c
index 527781728e0706b906a94ddfb8ee2e8bb06fa05e..bc6090dfcd01b07c7c55dbf378db122c7677ef20 100644 (file)
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -540,10 +540,12 @@ static int switch_branches(struct checkout_opts *opts, struct branch_info *new)
        unsigned char rev[20];
        int flag;
        memset(&old, 0, sizeof(old));
-       old.path = resolve_ref("HEAD", rev, 0, &flag);
+       old.path = xstrdup(resolve_ref("HEAD", rev, 0, &flag));
        old.commit = lookup_commit_reference_gently(rev, 1);
-       if (!(flag & REF_ISSYMREF))
+       if (!(flag & REF_ISSYMREF)) {
+               free((char *)old.path);
                old.path = NULL;
+       }
 
        if (old.path && !prefixcmp(old.path, "refs/heads/"))
                old.name = old.path + strlen("refs/heads/");
@@ -571,6 +573,7 @@ static int switch_branches(struct checkout_opts *opts, struct branch_info *new)
        update_refs_for_switch(opts, &old, new);
 
        ret = post_checkout_hook(old.commit, new->commit, 1);
+       free((char *)old.path);
        return ret || opts->writeout_error;
 }