Fix git-am safety checks