NEEDSWORK: Improve git stash in cases where directories replaced by files