revert: Propagate errors upwards from do_pick_commit