mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
merge-one-file: make sure we do not mismerge symbolic links.
We ran "merge" command on O->A, O->B, A!=B case without verifying the path involved is not a symlink. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
1c2c10b6e6
commit
54dd99a127
|
@ -58,6 +58,14 @@ case "${1:-.}${2:-.}${3:-.}" in
|
|||
# Modified in both, but differently.
|
||||
#
|
||||
"$1$2$3" | ".$2$3")
|
||||
|
||||
case ",$6,$7," in
|
||||
*,120000,*)
|
||||
echo "ERROR: $4: Not merging symbolic link changes."
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
src2=`git-unpack-file $3`
|
||||
case "$1" in
|
||||
'')
|
||||
|
|
Loading…
Reference in a new issue