summaryrefslogtreecommitdiff
path: root/builtin/worktree.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-02-12 09:49:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-12 21:13:35 (GMT)
commitee6763af0a3b97225803c6c908a29de40336cf38 (patch)
tree5345b7b1b711cec6a79f2f6a81e442423de2ee54 /builtin/worktree.c
parentcc73385cf6c5c229458775bc92e7dbbe24d11611 (diff)
downloadgit-ee6763af0a3b97225803c6c908a29de40336cf38.zip
git-ee6763af0a3b97225803c6c908a29de40336cf38.tar.gz
git-ee6763af0a3b97225803c6c908a29de40336cf38.tar.bz2
worktree remove: allow it when $GIT_WORK_TREE is already gone
"git worktree remove" basically consists of two things - delete $GIT_WORK_TREE - delete $GIT_DIR (which is $SUPER_GIT_DIR/worktrees/something) If $GIT_WORK_TREE is already gone for some reason, we should be able to finish the job by deleting $GIT_DIR. Two notes: - $GIT_WORK_TREE _can_ be missing if the worktree is locked. In that case we must not delete $GIT_DIR because the real $GIT_WORK_TREE may be in a usb stick somewhere. This is already handled because we check for lock first. - validate_worktree() is still called because it may do more checks in future (and it already does something else, like checking main worktree, but that's irrelevant in this case) Noticed-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/worktree.c')
-rw-r--r--builtin/worktree.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 990e47b..f77ef99 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -674,7 +674,7 @@ static int move_worktree(int ac, const char **av, const char *prefix)
reason);
die(_("cannot move a locked working tree"));
}
- if (validate_worktree(wt, &errmsg))
+ if (validate_worktree(wt, &errmsg, 0))
die(_("validation failed, cannot move working tree: %s"),
errmsg.buf);
strbuf_release(&errmsg);
@@ -799,15 +799,17 @@ static int remove_worktree(int ac, const char **av, const char *prefix)
reason);
die(_("cannot remove a locked working tree"));
}
- if (validate_worktree(wt, &errmsg))
+ if (validate_worktree(wt, &errmsg, WT_VALIDATE_WORKTREE_MISSING_OK))
die(_("validation failed, cannot remove working tree: %s"),
errmsg.buf);
strbuf_release(&errmsg);
- if (!force)
- check_clean_worktree(wt, av[0]);
+ if (file_exists(wt->path)) {
+ if (!force)
+ check_clean_worktree(wt, av[0]);
- ret |= delete_git_work_tree(wt);
+ ret |= delete_git_work_tree(wt);
+ }
/*
* continue on even if ret is non-zero, there's no going back
* from here.