Remove --allow-empty option from cherry-pick