Re: [PATCH v3 6/6] worktree: add "unlock" command

2016-06-01 Thread Duy Nguyen
On Wed, Jun 1, 2016 at 1:12 AM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> + if (is_main_worktree(wt)) >> + die(_("'%s' is a main working directory"), av[0]); >> + if (!wt->lock_reason) >> + die(_("'%s' is not locked"), av[0]); > > Exactly the same

Re: [PATCH v3 6/6] worktree: add "unlock" command

2016-05-31 Thread Junio C Hamano
Junio C Hamano writes: > Again, this seems to be built on an unseen version. I think I fixed > these up (and also the "missing second colon in the doc"), but please > double check what I push out later today. Ah, this comes on top of 0409e0b6 (worktree: simplify prefixing paths, 2016-05-22). I

Re: [PATCH v3 6/6] worktree: add "unlock" command

2016-05-31 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > Documentation/git-worktree.txt | 5 + > builtin/worktree.c | 28 > contrib/completion/git-completion.bash | 2 +- > t/t2028-worktree-move.sh |

Re: [PATCH v3 6/6] worktree: add "unlock" command

2016-05-31 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > + if (is_main_worktree(wt)) > + die(_("'%s' is a main working directory"), av[0]); > + if (!wt->lock_reason) > + die(_("'%s' is not locked"), av[0]); Exactly the same comment about the lack of need for lock_reason field as 5/6 appil