On Wed, Aug 15, 2018 at 7:26 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> writes: > > > --quit is supposed to be --abort but without restoring HEAD. Leaving > > CHERRY_PICK_HEAD behind could make other commands mistake that > > cherry-pick is still ongoing (e.g. "git commit --amend" will refuse to > > work). Clean it too. > > > > For abort, this job of deleting CHERRY_PICK_HEAD is on "git reset" so > > we don't need to do anything else. > > > > Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> > > --- > > Please do not hide this bugfix behind 1/2 that is likely to require > longer to cook than the fix itself. And more importantly, it makes > it impossible to merge down the fix to the maintenance track, as I > do not think we'd want to merge 1/2 there. Oh sorry I did not think about that. Will drop 1/2 and send 2/2 as standalone. But for the record, I think this has been a bug since the introduction of --quit in this command (back when it was still called --reset). -- Duy
