Comment 2 for bug 1585747

Looks good to me.

Now that you have your own system to handle symlink circularity, should you remove from directory* the half-assed attempt to not follow symlinks on the few implementations that make it possible?

PS: I usually prefer to git pull --rebase before I push, rather than merge, unless it was a long-running branch.