Re: [PATCH 4/5] worktree: add "lock" command

2016-05-22 Thread Eric Sunshine
On Sun, May 22, 2016 at 6:31 AM, Duy Nguyen wrote: > On Mon, May 16, 2016 at 7:09 AM, Eric Sunshine > wrote: >>> + old_reason = is_worktree_locked(wt); >>> + if (old_reason) { >>> + if (*old_reason) >>> +

Re: [PATCH 4/5] worktree: add "lock" command

2016-05-22 Thread Duy Nguyen
(the answer to rest of your questions is "yes you're right, will fix" or something along that line so I will not quote them here) On Mon, May 16, 2016 at 7:09 AM, Eric Sunshine wrote: >> + old_reason = is_worktree_locked(wt); >> + if (old_reason) { >> +

Re: [PATCH 4/5] worktree: add "lock" command

2016-05-15 Thread Eric Sunshine
On Tue, May 10, 2016 at 10:17 AM, Nguyễn Thái Ngọc Duy wrote: > +static int lock_worktree(int ac, const char **av, const char *prefix) > +{ > + const char *reason = "", *old_reason; > + struct option options[] = { > + OPT_STRING(0, "reason", ,

Re: [PATCH 4/5] worktree: add "lock" command

2016-05-15 Thread Eric Sunshine
On Tue, May 10, 2016 at 10:17 AM, Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt > @@ -11,6 +11,7 @@ SYNOPSIS > [verse] > 'git worktree add' [-f]

[PATCH 4/5] worktree: add "lock" command

2016-05-10 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-worktree.txt | 12 -- builtin/worktree.c | 41 ++ contrib/completion/git-completion.bash | 5 - t/t2028-worktree-move.sh (new +x) | 34