1. Stefan Saasen
  2. git

Commits

Junio C Hamano  committed 54dd99a

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>

  • Participants
  • Parent commits 1c2c10b
  • Branches master

Comments (0)

Files changed (1)

File git-merge-one-file.sh

View file
  • Ignore whitespace
 # 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
 	'')