WIP: gitdirstate: handle errors gracefully

I'm not entirely certain how to provoke the "extra patterns" error, but the previous code for handling it was definitely wrong.

Fixes: #345 (closed)