Do not disable Amend if error occurred

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Disable Amend if cherry pick is active is

Signed-off-by: Sven Strickroth <email@cs-ware.de>