Clean up git env vars consistently