undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

checkout: do not write bogus reflog entry out

Browse Source 
As resolve_ref() returns a static buffer that is local to the function,
the caller needs to be sure that it will not have any other calls to the
function before it uses the returned value, or store it away with a
strdup().  The code used old.path to record which branch it used to be on,
so that it can say between which branches the switch took place in the
reflog, but sometimes it failed to do so.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2011-07-06 15:14:43 -07:00
parent 782c2d65c2
commit c5bcf1f9f6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin-checkout.c
View File

@ -342,10 +342,12 @@ static int switch_branches(struct checkout_opts *opts,
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/");
@ -381,7 +383,7 @@ static int switch_branches(struct checkout_opts *opts,
return ret;
update_refs_for_switch(opts, &old, new);
free((char *)old.path);
return post_checkout_hook(old.commit, new->commit, 1);
}