Skip to content

Commit

Permalink
merge-one-file: make sure we do not mismerge symbolic links.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Dec 2, 2005
1 parent 1c2c10b commit 54dd99a
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions git-merge-one-file.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
'')
Expand Down

0 comments on commit 54dd99a

Please sign in to comment.