CUCC Expedition Handbook - Git Quick

Quick Reminder - Git

Version Control Software Reminders

This is NOT a tutorial. This is a set of reminders for people who already know all this stuff.

Since 2019 all use of version control software requires that you have key-pair setup already set up before any of this will work on your own machine.

- check that you can get ssh working before trying to run git too

If you can get to the expo laptop try these commands on that first as the key exchange has already been done. If the key exchnage has not been done then none of this will work.

Open a terminal in a new directory, e.g. /tmp/experiments/ in which you want to create the repo. It will automatically create a folder with the repo name e.g.'troggle' in that directory.

expoweb (The data management system) - this will fail until it is moved from hg to git
git clone ssh://expo@expo.survex.com:/home/expo/expoweb (read/write)
troggle (The data management system backend)
git clone ssh://expo@expo.survex.com:/home/expo/troggle (read/write)
loser (The survey data) - this will fail until it is moved from hg to git
git clone ssh://expo@expo.survex.com:/home/expo/loser (read/write)
drawings
git clone ssh://expo@expo.survex.com:/home/expo/drawings (read/write)

Using git in Windows

Once you've downloaded and installed a git client, the first step is to create what is called a checkout of the data management system. This creates a copy on your machine which you can edit to your heart's content. The command to initially check out ('clone') the entire expo data management system is:

git clone ssh://expo@expo.survex.com:/home/expo/expoweb

for subsequent updates

git update

will generally do the trick.

After you've made a change, commit it to you local copy with:

git commit (you can specify filenames to be specific)

The first time you do this on a Windows machineit will probably not work as it does not recognise the server key echnage. Fix this by running putty (downloading it from https://www.chiark.greenend.org.uk/~sgtatham/putty/), and connecting to the server 'expo@expo.survex.com' (on port 22). Confirm that this is the right server. If you succeed in getting a shell prompt then ssh connection are working and git should be able to clone the repo, and send changes back.