On 09/09/10 11:19, Brett Parker wrote:
This sounds like you're abusing git in ways it's not supposed to be abused in.
Quite probably! But see other email: to test my changes they need to be on the webserver (the machine I'm SSHing to).
Also, if this is "live" code that the rest of the world should see, you should be deploying it to a staging server first to test,
No, it's an internal dev server, from where it would go to a staging server then to a live server.
The dev server is on the same local network as my desktop.
Using a git repository over samba sounds like a whole world of pain, samba doesn't really do file caching, either, so you're hitting a lot of network traffic when you probably don't need to.
To be fair to it, it was only the git status that was slow in the end; when I ran through the diffs merging the changes that was fast enough to be perfectly usable.
When you say "I ran a merge" what do you mean?
The full process I ran through was in the "Merging changes between directories" thread[1], but the actual merge was via "git merge master".
[1] http://lists.alug.org.uk/pipermail/main/2010-September/028357.html