How can I deal with a git repo containing symlinks on windows

As part of our code repository, we have a symlink which is internal to the working tree.

Zen开发者_高级运维d -> ZendFramework1.10/library/Zend

This works fine for all the developers running Linux or OS X, but we're now getting some people trying to use the repository on Windows.

The functionality of the symlink can be replicated by deleting the link git creates, and using mklink to create the equivalent directory junction.

However, git now sees this as the deletion of the symbolic link, and the addition of a proper directory.

I'm looking for a way to have the two co-exist, is there a way to tell the Windows machines to ignore the Zend directory, even though it's technically versioned. If this breaks when the files in that directory change then so be it, but it'd be nice to be able to work with the rest of the repo without having to worry about the link.

You can use git-update-index to tell git to ignore changes to the file:

git update-index --assume-unchanged Zend

You could probably use cygwin on the machines running windows.

As Magnus Skog has suggested, git under cygwin copes correctly with the symlinks. I switched away from Git for Windows for this reason alone. However you need to weigh up this advantage against the overhead of setting up the cygwin environment for your Windows users (particularly for those unfamiliar with *nix and the command line; for example there are a number of outstanding issues when trying to use Cygwin and TortoiseGit.)