Do the clone-vs-update thing differently so it emits more text on errors.

Test plan:
Ran make successfully.