Re: [PATCH v2] cherry-pick: fix --quit not deleting CHERRY_PICK_HEAD

2018-08-16 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy 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 deleti

[PATCH v2] cherry-pick: fix --quit not deleting CHERRY_PICK_HEAD

2018-08-16 Thread Nguyễn Thái Ngọc Duy
--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