Merge branch 'jc/ident' into next

* jc/ident:
Keep Porcelainish from failing by broken ident after making changes.
Delay "empty ident" errors until they really matter.

diff --cc cache.h
Simple merge