Ensure git clone path works

Put code that only needs to run inside the fetch/merge path inside that
bit of code - otherwise it breaks after a clone as it needs to know what
revision you were on when you started.