The code here can result in errors that are hard to debug, especially if they don't trivially reproduce locally. We should output the git diff when this happens so that there's a clear explanation of what's failing.