diff --git a/handbook/computing/qstart-git.html b/handbook/computing/qstart-git.html index 8a3adf348..fddc08201 100644 --- a/handbook/computing/qstart-git.html +++ b/handbook/computing/qstart-git.html @@ -19,6 +19,10 @@ have key-pair setup already set up before any of - 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. +

You can read or clone these repos without any control, but to write ("push") to them you will need to use ssh://expo@expo.survex.com and set up the key exchange. + +

NOTE: always use user 'expo' as the login user (ssh://expo@...) even though within git you will be identified by your own ssh key name. +

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.

@@ -58,7 +62,7 @@ class="onright" src="git-arrows31.png" alt="git bread & butter commands subset"

Using git in Windows

-

Do not use the official "git for Windows" client software as it doesn't understand symlinks in the WSL filesystem we use on Windows. Use VS Code which understand WSL or a command line git in a WSL terminal window. +

Do not use the official "git for Windows" client software as it doesn't understand symlinks in the WSL filesystem (which is what we use on Windows). Use VS Code which understands WSL or a command line git in a WSL terminal window.

"Git is a 4 handle, dual boiler espresso machine – when all you need is instant."

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:

@@ -74,9 +78,13 @@ class="onright" src="git-arrows31.png" alt="git bread & butter commands subset"

git commit (you can specify filenames to be specific)

+

Windows key gotcha

+

The first time you do this on a Windows machine it will probably not work as it does not recognise the server key exchange. 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.

+ +

For more detailed instructions on making Pageant work see the section in the middle of the Filezilla instructions where it describes how to configure Pageant.

diff --git a/handbook/computing/repos.html b/handbook/computing/repos.html index 04a05ffa1..eccb33645 100644 --- a/handbook/computing/repos.html +++ b/handbook/computing/repos.html @@ -36,7 +36,8 @@ expo.survex.com:

Uploading cave survey data

-

You can read or clone these repos without any control, but to write ("push") to them you will need to use and set up the key exchange. +

You can read or clone these repos without any control, but to write ("push") to them you will need to use ssh://expo@expo.survex.com and set up the key exchange. +

NOTE: when using git to path to a repository, always use user 'expo' as the login user (ssh://expo@...) even though within git you will be identified by your own ssh key name. This is because file permissions on the server require this.

So cavers wanting to upload their cave survey data have to use a machine on which they key is already set up. The expo laptop lives in the potato hut during expo and it is sometimes joined by the laptop 'aziraphale'. These are both loaned machines running Linux. If you want to use your own laptop then see the minimal laptop setup.