cherry-pick: handle "-" after parsing options