On Sat, Jun 25, 2016 at 3:54 AM, Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> wrote:
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx>
> ---
> diff --git a/builtin/worktree.c b/builtin/worktree.c
> @@ -600,6 +601,81 @@ static int move_worktree(int ac, const char **av, const char *prefix)
> +static int remove_worktree(int ac, const char **av, const char *prefix)
> +{
> + worktrees = get_worktrees();
> + wt = find_worktree(worktrees, prefix, av[0]);
> + 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 ((reason = is_worktree_locked(wt))) {
> + if (*reason)
> + die(_("already locked, reason: %s"), reason);
> + die(_("already locked, no reason"));
"already locked" makes sense for 'worktree lock' command, but not
here. A simple "locked" would be clearer.
> + }
> + if (validate_worktree(wt, 0))
> + return -1;
Leaking 'worktrees'. free_worktrees(...) recommended.
> + strbuf_addstr(&sb, wt->path);
> + if (remove_dir_recursively(&sb, 0)) {
> + error_errno(_("failed to delete '%s'"), sb.buf);
> + ret = -1;
> + }
> + strbuf_reset(&sb);
> + strbuf_addstr(&sb, git_common_path("worktrees/%s", wt->id));
> + if (remove_dir_recursively(&sb, 0)) {
> + error_errno(_("failed to delete '%s'"), sb.buf);
> + ret = -1;
> + }
> + strbuf_release(&sb);
> + free_worktrees(worktrees);
> + return ret;
> +}
> diff --git a/t/t2028-worktree-move.sh b/t/t2028-worktree-move.sh
> @@ -89,4 +89,30 @@ test_expect_success 'move main worktree' '
> +test_expect_success 'remove locked worktree' '
> + git worktree lock destination &&
> + test_must_fail git worktree remove destination &&
> + git worktree unlock destination
> +'
'unlock' within test_when_finished(), perhaps?
> +test_expect_success 'remove worktree with dirty tracked file' '
> + echo dirty >>destination/init.t &&
> + test_must_fail git worktree remove destination
> +'
> +
> +test_expect_success 'remove worktree with untracked file' '
> + git -C destination checkout init.t &&
Perhaps this reversion of 'init.t' belongs in the preceding test which
modified it (wrapped in test_when_finished())?
> + : >destination/untracked &&
> + test_must_fail git worktree remove destination
> +'
> +
> +test_expect_success 'force remove worktree with untracked file' '
> + git worktree remove --force destination &&
> + test_path_is_missing destination
> +'
