Since you're rewriting history anyway, couldn't you add the sha1 hash to all the commits as metadata?