gitk: Improve cherry-pick error handling