diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-25 18:17:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-25 19:08:48 -0800 |
| commit | 308efc10d890265a4c62a8b58f025aaf8a1f244d (patch) | |
| tree | 62a546ee00f3364805a7ab036d8845fd259ed6fc /merge-recursive.c | |
| parent | 437b1b20df4b356c9342dac8d38849f24ef44f27 (diff) | |
| download | git-308efc10d890265a4c62a8b58f025aaf8a1f244d.tar.gz git-308efc10d890265a4c62a8b58f025aaf8a1f244d.tar.xz | |
merge-index: fix longstanding bug in merging symlinks
Ancient commit e2b6a9d0 added code to pass "file modes" from
merge-index to merge-one-file, and then later commit 54dd99a1
wanted to make sure we do not end up creating a nonsense symlink
that points at a path whose name contains conflict markers.
However, nobody noticed that the code in merge-index added by
e2b6a9d0 were stripping the S_IFMT bits and the code in 54dd99a1
was meaningless. This fixes it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions