fix two bugs in magit-commit

* Make sure we don't set `magit-custom-options' global value.
* Respect the prefix argument (AMENDP) when there are staged changes.