I decided to post this as I found it a little frustrating finding good documentation on this anywhere. It seems that it was in bits pieces, so I’m posting it here, so I don’t have to go through the trouble anymore. Hopefully, others will find it useful as well.
There are two things you’ll need to do:
- Create the remote git repo
- Create the local git repo
Once you’ve done these, you should be able to commit and push those commits to your remote repo through Xcode. You won’t need to create the local repo, if you already have one for your project.
If you’re migrating a project from Subversion, you should export the project from the Subversion repo before starting. That will checkout your project, without the hidden .svn administrative directories. As git adds it own administrative directories, I imagine Xcode might get confused if both were there.
I use ssh to connect to the command line on the server where my git repos reside. You may need to adjust these commands for your environment.
On the remote server, change to the directory where you keep your git repos and execute these commands:
- mkdir Project
- cd Project/
- git init –bare shared=users
The –shared parameter is required if you need others to use the repo. The group, ‘users’ should be whatever group has access to the git repo. On my system, the git directory is owned by “me” with the group, ‘users’ having ‘rwx’ privileges (rwx-rwx-rx).
On your local computer, close Xcode and open up the Terminal app and change to your project’s directory and type these commands:
- git init
- git add *
- git commit -m “First commit”
Click on the ‘Remotes’ folder under the repo name and then click the ‘Add Remote’ button at the bottom of the right pane. In the dialog box, type in a name for ‘Remote Name’ and then fill out the ‘Location’.
The ‘Remote Name’ is arbitrary but, ‘Location’ should take the form of:
username@server_name:/path/to/repo. Click ‘Create’. If your info was correct, the dialog should disappear and you should be ready to push your commits to the server. When you go to push your commit, you should see something like this:
Just click the ‘Push’ button and your changes will go to the server.
When working with a remote git server, you have to both, commit and then push, in that order. Commit only commits to the local repo. Push pushes the commits to the server. You’ll find both these commands under File->Source Control. Make some minor edits in your source and then try that now. You should be good.
A couple of tips:
Xcode gives you a key binding for ‘Commit’ (cmd-option-c), but not for ‘Push’. I edited my key bindings under Preferences and added cmd-option-p for ‘Push’. You can search for the ‘Push’ command in the key bindings search window and add one, if you like.
You can also commit your changes in the Organizer window, but, Xcode does not push these changes, so you’ll still need to push.
That’s it. Now I don’t have to worry about forgetting this.
EDIT: If you want to push to the remote server from the command line, you’ll first need to tell git the location of the remote repo. Use this command (ssh):
git remote add origin ssh://username@server/path/to/repo
Now, you can push your changes with this:
git push origin master
Where ‘master’ is the branch where you want your commits. I’m still learning git, but I believe git uses ‘master’, in the same way that subversion and cvs use the term, ‘trunk’.