summaryrefslogtreecommitdiff
path: root/merge-index.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-07-06 15:14:43 -0700
committerJunio C Hamano <gitster@pobox.com>2011-07-06 15:15:02 -0700
commitc5bcf1f9f6d3429ab9a09e07e28362e7d189005b (patch)
tree950431539a344a0fd912b4c212f3628676a0e44d /merge-index.c
parent782c2d65c24066a5d83453efb52763bc34c10f81 (diff)
downloadgit-c5bcf1f9f6d3429ab9a09e07e28362e7d189005b.tar.gz
checkout: do not write bogus reflog entry out
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>
Diffstat (limited to 'merge-index.c')
0 files changed, 0 insertions, 0 deletions