git-read-tree: be a lot more careful about merging dirty trees