I don't think that not committing your changes is the correct solution.
After every CR-related change, just do
git commit --amend. It will update your previous commit instead of creating a new one. After that you can do post-review -r xxxxxxx (where xxxxxxx is your CR number) to update the CR.