Here is a little bit background:
In my case, I made that commit (victim of did-not-exit-cleanly) from Git Bash. And tried the next commit from Tortoise, which worked!