On Tue, May 10, 2016 at 10:17 AM, Nguyễn Thái Ngọc Duy
<[email protected]> wrote:
> Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]>
> ---
> diff --git a/builtin/worktree.c b/builtin/worktree.c
> @@ -498,6 +499,34 @@ static int lock_worktree(int ac, const char **av, const
> char *prefix)
> +static int unlock_worktree(int ac, const char **av, const char *prefix)
> +{
> + struct option options[] = {
> + OPT_END()
> + };
> + struct worktree **worktrees, *wt;
> + struct strbuf dst = STRBUF_INIT;
> +
> + ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
> + if (ac != 1)
> + usage_with_options(worktree_usage, options);
> +
> + strbuf_addstr(&dst, prefix_filename(prefix,
> + strlen(prefix),
> + av[0]));
> +
> + worktrees = get_worktrees();
> + wt = find_worktree_by_path(worktrees, dst.buf);
strbuf_release(&dst);
> + if (!wt)
> + die(_("'%s' is not a working directory"), av[0]);
> + if (is_main_worktree(wt))
> + die(_("'%s' is a main working directory"), av[0]);
> + if (!is_worktree_locked(wt))
> + die(_("not locked"));
> +
> + return unlink_or_warn(git_common_path("worktrees/%s/locked", wt->id));
> +}
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
