Junio C HamanoCommit 3af244ca added unlink before running symlink to update the working tree with the merge result, but it was unlinking a wrong file This resulted in loss of the path pointed by a symlink.
Signed-off-by: Junio C Hamano <junkio@cox.net> --- * This and the fix to merge-index are meant for maint to be included in 1.5.0.2.
merge-recursive.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Show changes to merge-recursive.c +1 −1
diff --git a/merge-recursive.c b/merge-recursive.c index 5898942..397a7ad 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -589,7 +589,7 @@ static void update_file_flags(const unsigned char *sha, memcpy(lnk, buf, size); lnk[size] = '\0'; mkdir_p(path, 0777); - unlink(lnk); + unlink(path); symlink(lnk, path); } else die("do not know what to do with %06o %s '%s'",
-- 1.5.0.1.793.gedfd5