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

2018-08-15 Thread Junio C Hamano
Duy Nguyen writes: > On Wed, Aug 15, 2018 at 7:26 PM Junio C Hamano wrote: >> >> 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

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

2018-08-15 Thread Duy Nguyen
On Wed, Aug 15, 2018 at 7:26 PM Junio C Hamano wrote: > > 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 re

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

2018-08-15 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 deleting

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

2018-08-15 Thread Stefan Beller
On Wed, Aug 15, 2018 at 10:18 AM Duy Nguyen wrote: > > On Wed, Aug 15, 2018 at 7:09 PM Stefan Beller wrote: > > Technically you would not need patch 1 in this series, as you could call > > remove_branch_state(void) as before that patch to do the same thing here. > > I guess that patch 1 is more o

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

2018-08-15 Thread Duy Nguyen
On Wed, Aug 15, 2018 at 7:09 PM Stefan Beller wrote: > Technically you would not need patch 1 in this series, as you could call > remove_branch_state(void) as before that patch to do the same thing here. > I guess that patch 1 is more of a drive by cleanup, then? Yes. > It looks a bit interestin

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

2018-08-15 Thread Stefan Beller
On Wed, Aug 15, 2018 at 9:23 AM Nguyễn Thái Ngọc Duy wrote: > > --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. > >