projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 78a8d64) | patch
Handle core.symlinks=false case in merge-recursive.
authorJohannes Sixt <johannes.sixt@telecom.at>
Sat, 3 Mar 2007 19:32:46 +0000 (20:32 +0100)
committerJunio C Hamano <junkio@cox.net>
Sun, 4 Mar 2007 02:59:41 +0000 (18:59 -0800)
commit723024d696a47556baac77700e47fef288691f37
tree6c1d71a57f78ba89d54266cf64ee3a37aaf08251tree | snapshot
parent78a8d641c14dc2f0a306d787fa1e42d400b3af4dcommit | diff
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>
merge-recursive.c diff | blob | history
t/t6025-merge-symlinks.sh [new file with mode: 0644] blob
Git—the stupid content tracker