diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-26 02:42:07 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-26 03:08:48 (GMT) |
| commit | 17cd29b25c0f480a3c6e1dd9617d9c6046e3c280 (patch) | |
| tree | e3e8071ecf7c3e5867f8e831843561382c472349 /git-verify-tag.sh | |
| parent | 308efc10d890265a4c62a8b58f025aaf8a1f244d (diff) | |
| download | git-17cd29b25c0f480a3c6e1dd9617d9c6046e3c280.zip git-17cd29b25c0f480a3c6e1dd9617d9c6046e3c280.tar.gz git-17cd29b25c0f480a3c6e1dd9617d9c6046e3c280.tar.bz2 | |
merge-recursive: fix longstanding bug in merging symlinks
Commit 3af244ca added unlink(2) before running symlink(2) to
update the working tree with the merge result, but it was
unlinking a wrong path. This resulted in loss of the path
pointed by a symlink.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-verify-tag.sh')
0 files changed, 0 insertions, 0 deletions