diff options
| author | Johannes Sixt <johannes.sixt@telecom.at> | 2007-03-03 20:32:46 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-03 18:59:41 -0800 |
| commit | 723024d696a47556baac77700e47fef288691f37 (patch) | |
| tree | 6c1d71a57f78ba89d54266cf64ee3a37aaf08251 /builtin-reflog.c | |
| parent | 78a8d641c14dc2f0a306d787fa1e42d400b3af4d (diff) | |
| download | git-723024d696a47556baac77700e47fef288691f37.tar.gz | |
Handle core.symlinks=false case in merge-recursive.
If the file system does not support symbolic links (core.symlinks=false),
merge-recursive must write the merged symbolic link text into a regular
file.
While we are here, fix a tiny memory leak in the if-branch that writes
real symbolic links.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-reflog.c')
0 files changed, 0 insertions, 0 deletions