Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Fix permissions on test scripts | Alex Riesen | 2007-04-16 |
| | | | | | | | | Make every test executable. Remove exec-attribute from included shell files, they can't used standalone anyway. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | ||
* | Handle core.symlinks=false case in merge-recursive. | Johannes Sixt | 2007-03-03 |
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> |