6 #include "parse-options.h"
7 #include "argv-array.h"
10 #include "run-command.h"
12 #include "submodule.h"
16 static const char * const worktree_usage[] = {
17 N_("git worktree add [<options>] <path> [<commit-ish>]"),
18 N_("git worktree list [<options>]"),
19 N_("git worktree lock [<options>] <path>"),
20 N_("git worktree move <worktree> <new-path>"),
21 N_("git worktree prune [<options>]"),
22 N_("git worktree remove [<options>] <worktree>"),
23 N_("git worktree unlock <path>"),
37 static int guess_remote;
38 static timestamp_t expire;
40 static int git_worktree_config(const char *var, const char *value, void *cb)
42 if (!strcmp(var, "worktree.guessremote")) {
43 guess_remote = git_config_bool(var, value);
47 return git_default_config(var, value, cb);
50 static int delete_git_dir(const char *id)
52 struct strbuf sb = STRBUF_INIT;
55 strbuf_addstr(&sb, git_common_path("worktrees/%s", id));
56 ret = remove_dir_recursively(&sb, 0);
57 if (ret < 0 && errno == ENOTDIR)
60 error_errno(_("failed to delete '%s'"), sb.buf);
65 static void delete_worktrees_dir_if_empty(void)
67 rmdir(git_path("worktrees")); /* ignore failed removal */
70 static int prune_worktree(const char *id, struct strbuf *reason)
78 if (!is_directory(git_path("worktrees/%s", id))) {
79 strbuf_addf(reason, _("Removing worktrees/%s: not a valid directory"), id);
82 if (file_exists(git_path("worktrees/%s/locked", id)))
84 if (stat(git_path("worktrees/%s/gitdir", id), &st)) {
85 strbuf_addf(reason, _("Removing worktrees/%s: gitdir file does not exist"), id);
88 fd = open(git_path("worktrees/%s/gitdir", id), O_RDONLY);
90 strbuf_addf(reason, _("Removing worktrees/%s: unable to read gitdir file (%s)"),
94 len = xsize_t(st.st_size);
97 read_result = read_in_full(fd, path, len);
98 if (read_result < 0) {
99 strbuf_addf(reason, _("Removing worktrees/%s: unable to read gitdir file (%s)"),
100 id, strerror(errno));
107 if (read_result != len) {
109 _("Removing worktrees/%s: short read (expected %"PRIuMAX" bytes, read %"PRIuMAX")"),
110 id, (uintmax_t)len, (uintmax_t)read_result);
114 while (len && (path[len - 1] == '\n' || path[len - 1] == '\r'))
117 strbuf_addf(reason, _("Removing worktrees/%s: invalid gitdir file"), id);
122 if (!file_exists(path)) {
124 if (stat(git_path("worktrees/%s/index", id), &st) ||
125 st.st_mtime <= expire) {
126 strbuf_addf(reason, _("Removing worktrees/%s: gitdir file points to non-existent location"), id);
136 static void prune_worktrees(void)
138 struct strbuf reason = STRBUF_INIT;
139 DIR *dir = opendir(git_path("worktrees"));
143 while ((d = readdir(dir)) != NULL) {
144 if (is_dot_or_dotdot(d->d_name))
146 strbuf_reset(&reason);
147 if (!prune_worktree(d->d_name, &reason))
149 if (show_only || verbose)
150 printf("%s\n", reason.buf);
153 delete_git_dir(d->d_name);
157 delete_worktrees_dir_if_empty();
158 strbuf_release(&reason);
161 static int prune(int ac, const char **av, const char *prefix)
163 struct option options[] = {
164 OPT__DRY_RUN(&show_only, N_("do not remove, show only")),
165 OPT__VERBOSE(&verbose, N_("report pruned working trees")),
166 OPT_EXPIRY_DATE(0, "expire", &expire,
167 N_("expire working trees older than <time>")),
172 ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
174 usage_with_options(worktree_usage, options);
179 static char *junk_work_tree;
180 static char *junk_git_dir;
182 static pid_t junk_pid;
184 static void remove_junk(void)
186 struct strbuf sb = STRBUF_INIT;
187 if (!is_junk || getpid() != junk_pid)
190 strbuf_addstr(&sb, junk_git_dir);
191 remove_dir_recursively(&sb, 0);
194 if (junk_work_tree) {
195 strbuf_addstr(&sb, junk_work_tree);
196 remove_dir_recursively(&sb, 0);
201 static void remove_junk_on_signal(int signo)
208 static const char *worktree_basename(const char *path, int *olen)
214 while (len && is_dir_sep(path[len - 1]))
217 for (name = path + len - 1; name > path; name--)
218 if (is_dir_sep(*name)) {
227 static void validate_worktree_add(const char *path, const struct add_opts *opts)
229 struct worktree **worktrees;
233 if (file_exists(path) && !is_empty_dir(path))
234 die(_("'%s' already exists"), path);
236 worktrees = get_worktrees(0);
237 wt = find_worktree_by_path(worktrees, path);
241 locked = !!worktree_lock_reason(wt);
242 if ((!locked && opts->force) || (locked && opts->force > 1)) {
243 if (delete_git_dir(wt->id))
244 die(_("unable to re-add worktree '%s'"), path);
249 die(_("'%s' is a missing but locked worktree;\nuse 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"), path);
251 die(_("'%s' is a missing but already registered worktree;\nuse 'add -f' to override, or 'prune' or 'remove' to clear"), path);
254 free_worktrees(worktrees);
257 static int add_worktree(const char *path, const char *refname,
258 const struct add_opts *opts)
260 struct strbuf sb_git = STRBUF_INIT, sb_repo = STRBUF_INIT;
261 struct strbuf sb = STRBUF_INIT, realpath = STRBUF_INIT;
263 struct child_process cp = CHILD_PROCESS_INIT;
264 struct argv_array child_env = ARGV_ARRAY_INIT;
265 unsigned int counter = 0;
267 struct strbuf symref = STRBUF_INIT;
268 struct commit *commit = NULL;
270 struct strbuf sb_name = STRBUF_INIT;
272 validate_worktree_add(path, opts);
274 /* is 'refname' a branch or commit? */
275 if (!opts->detach && !strbuf_check_branch_ref(&symref, refname) &&
276 ref_exists(symref.buf)) {
279 die_if_checked_out(symref.buf, 0);
281 commit = lookup_commit_reference_by_name(refname);
283 die(_("invalid reference: %s"), refname);
285 name = worktree_basename(path, &len);
286 strbuf_add(&sb, name, path + len - name);
287 sanitize_refname_component(sb.buf, &sb_name);
289 BUG("How come '%s' becomes empty after sanitization?", sb.buf);
292 git_path_buf(&sb_repo, "worktrees/%s", name);
294 if (safe_create_leading_directories_const(sb_repo.buf))
295 die_errno(_("could not create leading directories of '%s'"),
298 while (mkdir(sb_repo.buf, 0777)) {
300 if ((errno != EEXIST) || !counter /* overflow */)
301 die_errno(_("could not create directory of '%s'"),
303 strbuf_setlen(&sb_repo, len);
304 strbuf_addf(&sb_repo, "%d", counter);
306 name = strrchr(sb_repo.buf, '/') + 1;
310 sigchain_push_common(remove_junk_on_signal);
312 junk_git_dir = xstrdup(sb_repo.buf);
316 * lock the incomplete repo so prune won't delete it, unlock
317 * after the preparation is over.
319 strbuf_addf(&sb, "%s/locked", sb_repo.buf);
320 if (!opts->keep_locked)
321 write_file(sb.buf, "initializing");
323 write_file(sb.buf, "added with --lock");
325 strbuf_addf(&sb_git, "%s/.git", path);
326 if (safe_create_leading_directories_const(sb_git.buf))
327 die_errno(_("could not create leading directories of '%s'"),
329 junk_work_tree = xstrdup(path);
332 strbuf_addf(&sb, "%s/gitdir", sb_repo.buf);
333 strbuf_realpath(&realpath, sb_git.buf, 1);
334 write_file(sb.buf, "%s", realpath.buf);
335 strbuf_realpath(&realpath, get_git_common_dir(), 1);
336 write_file(sb_git.buf, "gitdir: %s/worktrees/%s",
339 * This is to keep resolve_ref() happy. We need a valid HEAD
340 * or is_git_directory() will reject the directory. Any value which
341 * looks like an object ID will do since it will be immediately
342 * replaced by the symbolic-ref or update-ref invocation in the new
346 strbuf_addf(&sb, "%s/HEAD", sb_repo.buf);
347 write_file(sb.buf, "%s", oid_to_hex(&null_oid));
349 strbuf_addf(&sb, "%s/commondir", sb_repo.buf);
350 write_file(sb.buf, "../..");
352 argv_array_pushf(&child_env, "%s=%s", GIT_DIR_ENVIRONMENT, sb_git.buf);
353 argv_array_pushf(&child_env, "%s=%s", GIT_WORK_TREE_ENVIRONMENT, path);
357 argv_array_pushl(&cp.args, "update-ref", "HEAD",
358 oid_to_hex(&commit->object.oid), NULL);
360 argv_array_pushl(&cp.args, "symbolic-ref", "HEAD",
363 argv_array_push(&cp.args, "--quiet");
366 cp.env = child_env.argv;
367 ret = run_command(&cp);
371 if (opts->checkout) {
373 argv_array_clear(&cp.args);
374 argv_array_pushl(&cp.args, "reset", "--hard", "--no-recurse-submodules", NULL);
376 argv_array_push(&cp.args, "--quiet");
377 cp.env = child_env.argv;
378 ret = run_command(&cp);
384 FREE_AND_NULL(junk_work_tree);
385 FREE_AND_NULL(junk_git_dir);
388 if (ret || !opts->keep_locked) {
390 strbuf_addf(&sb, "%s/locked", sb_repo.buf);
391 unlink_or_warn(sb.buf);
395 * Hook failure does not warrant worktree deletion, so run hook after
396 * is_junk is cleared, but do return appropriate code when hook fails.
398 if (!ret && opts->checkout) {
399 const char *hook = find_hook("post-checkout");
401 const char *env[] = { "GIT_DIR", "GIT_WORK_TREE", NULL };
404 cp.stdout_to_stderr = 1;
408 cp.trace2_hook_name = "post-checkout";
409 argv_array_pushl(&cp.args, absolute_path(hook),
410 oid_to_hex(&null_oid),
411 oid_to_hex(&commit->object.oid),
413 ret = run_command(&cp);
417 argv_array_clear(&child_env);
419 strbuf_release(&symref);
420 strbuf_release(&sb_repo);
421 strbuf_release(&sb_git);
422 strbuf_release(&sb_name);
423 strbuf_release(&realpath);
427 static void print_preparing_worktree_line(int detach,
429 const char *new_branch,
430 int force_new_branch)
432 if (force_new_branch) {
433 struct commit *commit = lookup_commit_reference_by_name(new_branch);
435 printf_ln(_("Preparing worktree (new branch '%s')"), new_branch);
437 printf_ln(_("Preparing worktree (resetting branch '%s'; was at %s)"),
439 find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV));
440 } else if (new_branch) {
441 printf_ln(_("Preparing worktree (new branch '%s')"), new_branch);
443 struct strbuf s = STRBUF_INIT;
444 if (!detach && !strbuf_check_branch_ref(&s, branch) &&
446 printf_ln(_("Preparing worktree (checking out '%s')"),
449 struct commit *commit = lookup_commit_reference_by_name(branch);
451 die(_("invalid reference: %s"), branch);
452 printf_ln(_("Preparing worktree (detached HEAD %s)"),
453 find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV));
459 static const char *dwim_branch(const char *path, const char **new_branch)
462 const char *s = worktree_basename(path, &n);
463 const char *branchname = xstrndup(s, n);
464 struct strbuf ref = STRBUF_INIT;
467 if (!strbuf_check_branch_ref(&ref, branchname) &&
468 ref_exists(ref.buf)) {
469 strbuf_release(&ref);
473 *new_branch = branchname;
475 struct object_id oid;
477 unique_tracking_name(*new_branch, &oid, NULL);
483 static int add(int ac, const char **av, const char *prefix)
485 struct add_opts opts;
486 const char *new_branch_force = NULL;
489 const char *new_branch = NULL;
490 const char *opt_track = NULL;
491 struct option options[] = {
492 OPT__FORCE(&opts.force,
493 N_("checkout <branch> even if already checked out in other worktree"),
494 PARSE_OPT_NOCOMPLETE),
495 OPT_STRING('b', NULL, &new_branch, N_("branch"),
496 N_("create a new branch")),
497 OPT_STRING('B', NULL, &new_branch_force, N_("branch"),
498 N_("create or reset a branch")),
499 OPT_BOOL(0, "detach", &opts.detach, N_("detach HEAD at named commit")),
500 OPT_BOOL(0, "checkout", &opts.checkout, N_("populate the new working tree")),
501 OPT_BOOL(0, "lock", &opts.keep_locked, N_("keep the new working tree locked")),
502 OPT__QUIET(&opts.quiet, N_("suppress progress reporting")),
503 OPT_PASSTHRU(0, "track", &opt_track, NULL,
504 N_("set up tracking mode (see git-branch(1))"),
505 PARSE_OPT_NOARG | PARSE_OPT_OPTARG),
506 OPT_BOOL(0, "guess-remote", &guess_remote,
507 N_("try to match the new branch name with a remote-tracking branch")),
511 memset(&opts, 0, sizeof(opts));
513 ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
514 if (!!opts.detach + !!new_branch + !!new_branch_force > 1)
515 die(_("-b, -B, and --detach are mutually exclusive"));
516 if (ac < 1 || ac > 2)
517 usage_with_options(worktree_usage, options);
519 path = prefix_filename(prefix, av[0]);
520 branch = ac < 2 ? "HEAD" : av[1];
522 if (!strcmp(branch, "-"))
525 if (new_branch_force) {
526 struct strbuf symref = STRBUF_INIT;
528 new_branch = new_branch_force;
531 !strbuf_check_branch_ref(&symref, new_branch) &&
532 ref_exists(symref.buf))
533 die_if_checked_out(symref.buf, 0);
534 strbuf_release(&symref);
537 if (ac < 2 && !new_branch && !opts.detach) {
538 const char *s = dwim_branch(path, &new_branch);
543 if (ac == 2 && !new_branch && !opts.detach) {
544 struct object_id oid;
545 struct commit *commit;
548 commit = lookup_commit_reference_by_name(branch);
550 remote = unique_tracking_name(branch, &oid, NULL);
558 print_preparing_worktree_line(opts.detach, branch, new_branch, !!new_branch_force);
561 struct child_process cp = CHILD_PROCESS_INIT;
563 argv_array_push(&cp.args, "branch");
564 if (new_branch_force)
565 argv_array_push(&cp.args, "--force");
567 argv_array_push(&cp.args, "--quiet");
568 argv_array_push(&cp.args, new_branch);
569 argv_array_push(&cp.args, branch);
571 argv_array_push(&cp.args, opt_track);
572 if (run_command(&cp))
575 } else if (opt_track) {
576 die(_("--[no-]track can only be used if a new branch is created"));
581 return add_worktree(path, branch, &opts);
584 static void show_worktree_porcelain(struct worktree *wt)
586 printf("worktree %s\n", wt->path);
590 printf("HEAD %s\n", oid_to_hex(&wt->head_oid));
592 printf("detached\n");
593 else if (wt->head_ref)
594 printf("branch %s\n", wt->head_ref);
599 static void show_worktree(struct worktree *wt, int path_maxlen, int abbrev_len)
601 struct strbuf sb = STRBUF_INIT;
602 int cur_path_len = strlen(wt->path);
603 int path_adj = cur_path_len - utf8_strwidth(wt->path);
605 strbuf_addf(&sb, "%-*s ", 1 + path_maxlen + path_adj, wt->path);
607 strbuf_addstr(&sb, "(bare)");
609 strbuf_addf(&sb, "%-*s ", abbrev_len,
610 find_unique_abbrev(&wt->head_oid, DEFAULT_ABBREV));
612 strbuf_addstr(&sb, "(detached HEAD)");
613 else if (wt->head_ref) {
614 char *ref = shorten_unambiguous_ref(wt->head_ref, 0);
615 strbuf_addf(&sb, "[%s]", ref);
618 strbuf_addstr(&sb, "(error)");
620 printf("%s\n", sb.buf);
625 static void measure_widths(struct worktree **wt, int *abbrev, int *maxlen)
629 for (i = 0; wt[i]; i++) {
631 int path_len = strlen(wt[i]->path);
633 if (path_len > *maxlen)
635 sha1_len = strlen(find_unique_abbrev(&wt[i]->head_oid, *abbrev));
636 if (sha1_len > *abbrev)
641 static int list(int ac, const char **av, const char *prefix)
645 struct option options[] = {
646 OPT_BOOL(0, "porcelain", &porcelain, N_("machine-readable output")),
650 ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
652 usage_with_options(worktree_usage, options);
654 struct worktree **worktrees = get_worktrees(GWT_SORT_LINKED);
655 int path_maxlen = 0, abbrev = DEFAULT_ABBREV, i;
658 measure_widths(worktrees, &abbrev, &path_maxlen);
660 for (i = 0; worktrees[i]; i++) {
662 show_worktree_porcelain(worktrees[i]);
664 show_worktree(worktrees[i], path_maxlen, abbrev);
666 free_worktrees(worktrees);
671 static int lock_worktree(int ac, const char **av, const char *prefix)
673 const char *reason = "", *old_reason;
674 struct option options[] = {
675 OPT_STRING(0, "reason", &reason, N_("string"),
676 N_("reason for locking")),
679 struct worktree **worktrees, *wt;
681 ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
683 usage_with_options(worktree_usage, options);
685 worktrees = get_worktrees(0);
686 wt = find_worktree(worktrees, prefix, av[0]);
688 die(_("'%s' is not a working tree"), av[0]);
689 if (is_main_worktree(wt))
690 die(_("The main working tree cannot be locked or unlocked"));
692 old_reason = worktree_lock_reason(wt);
695 die(_("'%s' is already locked, reason: %s"),
697 die(_("'%s' is already locked"), av[0]);
700 write_file(git_common_path("worktrees/%s/locked", wt->id),
702 free_worktrees(worktrees);
706 static int unlock_worktree(int ac, const char **av, const char *prefix)
708 struct option options[] = {
711 struct worktree **worktrees, *wt;
714 ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
716 usage_with_options(worktree_usage, options);
718 worktrees = get_worktrees(0);
719 wt = find_worktree(worktrees, prefix, av[0]);
721 die(_("'%s' is not a working tree"), av[0]);
722 if (is_main_worktree(wt))
723 die(_("The main working tree cannot be locked or unlocked"));
724 if (!worktree_lock_reason(wt))
725 die(_("'%s' is not locked"), av[0]);
726 ret = unlink_or_warn(git_common_path("worktrees/%s/locked", wt->id));
727 free_worktrees(worktrees);
731 static void validate_no_submodules(const struct worktree *wt)
733 struct index_state istate = { NULL };
734 struct strbuf path = STRBUF_INIT;
735 int i, found_submodules = 0;
737 if (is_directory(worktree_git_path(wt, "modules"))) {
739 * There could be false positives, e.g. the "modules"
740 * directory exists but is empty. But it's a rare case and
741 * this simpler check is probably good enough for now.
743 found_submodules = 1;
744 } else if (read_index_from(&istate, worktree_git_path(wt, "index"),
745 get_worktree_git_dir(wt)) > 0) {
746 for (i = 0; i < istate.cache_nr; i++) {
747 struct cache_entry *ce = istate.cache[i];
750 if (!S_ISGITLINK(ce->ce_mode))
754 strbuf_addf(&path, "%s/%s", wt->path, ce->name);
755 if (!is_submodule_populated_gently(path.buf, &err))
758 found_submodules = 1;
762 discard_index(&istate);
763 strbuf_release(&path);
765 if (found_submodules)
766 die(_("working trees containing submodules cannot be moved or removed"));
769 static int move_worktree(int ac, const char **av, const char *prefix)
772 struct option options[] = {
774 N_("force move even if worktree is dirty or locked"),
775 PARSE_OPT_NOCOMPLETE),
778 struct worktree **worktrees, *wt;
779 struct strbuf dst = STRBUF_INIT;
780 struct strbuf errmsg = STRBUF_INIT;
781 const char *reason = NULL;
784 ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
786 usage_with_options(worktree_usage, options);
788 path = prefix_filename(prefix, av[1]);
789 strbuf_addstr(&dst, path);
792 worktrees = get_worktrees(0);
793 wt = find_worktree(worktrees, prefix, av[0]);
795 die(_("'%s' is not a working tree"), av[0]);
796 if (is_main_worktree(wt))
797 die(_("'%s' is a main working tree"), av[0]);
798 if (is_directory(dst.buf)) {
799 const char *sep = find_last_dir_sep(wt->path);
802 die(_("could not figure out destination name from '%s'"),
804 strbuf_trim_trailing_dir_sep(&dst);
805 strbuf_addstr(&dst, sep);
807 if (file_exists(dst.buf))
808 die(_("target '%s' already exists"), dst.buf);
810 validate_no_submodules(wt);
813 reason = worktree_lock_reason(wt);
816 die(_("cannot move a locked working tree, lock reason: %s\nuse 'move -f -f' to override or unlock first"),
818 die(_("cannot move a locked working tree;\nuse 'move -f -f' to override or unlock first"));
820 if (validate_worktree(wt, &errmsg, 0))
821 die(_("validation failed, cannot move working tree: %s"),
823 strbuf_release(&errmsg);
825 if (rename(wt->path, dst.buf) == -1)
826 die_errno(_("failed to move '%s' to '%s'"), wt->path, dst.buf);
828 update_worktree_location(wt, dst.buf);
830 strbuf_release(&dst);
831 free_worktrees(worktrees);
836 * Note, "git status --porcelain" is used to determine if it's safe to
837 * delete a whole worktree. "git status" does not ignore user
838 * configuration, so if a normal "git status" shows "clean" for the
839 * user, then it's ok to remove it.
841 * This assumption may be a bad one. We may want to ignore
842 * (potentially bad) user settings and only delete a worktree when
843 * it's absolutely safe to do so from _our_ point of view because we
846 static void check_clean_worktree(struct worktree *wt,
847 const char *original_path)
849 struct argv_array child_env = ARGV_ARRAY_INIT;
850 struct child_process cp;
855 * Until we sort this out, all submodules are "dirty" and
856 * will abort this function.
858 validate_no_submodules(wt);
860 argv_array_pushf(&child_env, "%s=%s/.git",
861 GIT_DIR_ENVIRONMENT, wt->path);
862 argv_array_pushf(&child_env, "%s=%s",
863 GIT_WORK_TREE_ENVIRONMENT, wt->path);
864 memset(&cp, 0, sizeof(cp));
865 argv_array_pushl(&cp.args, "status",
866 "--porcelain", "--ignore-submodules=none",
868 cp.env = child_env.argv;
872 ret = start_command(&cp);
874 die_errno(_("failed to run 'git status' on '%s'"),
876 ret = xread(cp.out, buf, sizeof(buf));
878 die(_("'%s' contains modified or untracked files, use --force to delete it"),
881 ret = finish_command(&cp);
883 die_errno(_("failed to run 'git status' on '%s', code %d"),
887 static int delete_git_work_tree(struct worktree *wt)
889 struct strbuf sb = STRBUF_INIT;
892 strbuf_addstr(&sb, wt->path);
893 if (remove_dir_recursively(&sb, 0)) {
894 error_errno(_("failed to delete '%s'"), sb.buf);
901 static int remove_worktree(int ac, const char **av, const char *prefix)
904 struct option options[] = {
906 N_("force removal even if worktree is dirty or locked"),
907 PARSE_OPT_NOCOMPLETE),
910 struct worktree **worktrees, *wt;
911 struct strbuf errmsg = STRBUF_INIT;
912 const char *reason = NULL;
915 ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
917 usage_with_options(worktree_usage, options);
919 worktrees = get_worktrees(0);
920 wt = find_worktree(worktrees, prefix, av[0]);
922 die(_("'%s' is not a working tree"), av[0]);
923 if (is_main_worktree(wt))
924 die(_("'%s' is a main working tree"), av[0]);
926 reason = worktree_lock_reason(wt);
929 die(_("cannot remove a locked working tree, lock reason: %s\nuse 'remove -f -f' to override or unlock first"),
931 die(_("cannot remove a locked working tree;\nuse 'remove -f -f' to override or unlock first"));
933 if (validate_worktree(wt, &errmsg, WT_VALIDATE_WORKTREE_MISSING_OK))
934 die(_("validation failed, cannot remove working tree: %s"),
936 strbuf_release(&errmsg);
938 if (file_exists(wt->path)) {
940 check_clean_worktree(wt, av[0]);
942 ret |= delete_git_work_tree(wt);
945 * continue on even if ret is non-zero, there's no going back
948 ret |= delete_git_dir(wt->id);
949 delete_worktrees_dir_if_empty();
951 free_worktrees(worktrees);
955 int cmd_worktree(int ac, const char **av, const char *prefix)
957 struct option options[] = {
961 git_config(git_worktree_config, NULL);
964 usage_with_options(worktree_usage, options);
967 if (!strcmp(av[1], "add"))
968 return add(ac - 1, av + 1, prefix);
969 if (!strcmp(av[1], "prune"))
970 return prune(ac - 1, av + 1, prefix);
971 if (!strcmp(av[1], "list"))
972 return list(ac - 1, av + 1, prefix);
973 if (!strcmp(av[1], "lock"))
974 return lock_worktree(ac - 1, av + 1, prefix);
975 if (!strcmp(av[1], "unlock"))
976 return unlock_worktree(ac - 1, av + 1, prefix);
977 if (!strcmp(av[1], "move"))
978 return move_worktree(ac - 1, av + 1, prefix);
979 if (!strcmp(av[1], "remove"))
980 return remove_worktree(ac - 1, av + 1, prefix);
981 usage_with_options(worktree_usage, options);