On Wed, Jul 3, 2019 at 12:51 AM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > Duy Nguyen <pclouds@xxxxxxxxx> writes: > > > I agree, this is not "canceling". I think this series causes conflicts > > with pw/clean-sequencer-state-upon-final-commit and the warning is > > accidentally enabled (partly my fault since I named the argument > > "verbose"). > > > > Junio, in this conflict resolution (merging nd/switch-and-restore to > > next), we should pass '0' instead of 'verbose' to > > sequencer_post_commit_cleanup(). > > Thanks for an update to the merge-fix. What should the name of the > parameter to the sequencer_post_commit_cleanup() funcion be then, > though? Perhaps we'd want an update after the topic graduates to > the 'master' branch. Definitely. I was thinking something with "warn" and "cancel", which is more the the point. Probably warn_cancel_in_progress, or something. -- Duy
