6 #include "parse-options.h"
10 #include "run-command.h"
13 #include "submodule.h"
18 static const char * const worktree_usage[] = {
19 N_("git worktree add [<options>] <path> [<commit-ish>]"),
20 N_("git worktree list [<options>]"),
21 N_("git worktree lock [<options>] <path>"),
22 N_("git worktree move <worktree> <new-path>"),
23 N_("git worktree prune [<options>]"),
24 N_("git worktree remove [<options>] <worktree>"),
25 N_("git worktree unlock <path>"),
39 static int guess_remote;
40 static timestamp_t expire;
42 static int git_worktree_config(const char *var, const char *value, void *cb)
44 if (!strcmp(var, "worktree.guessremote")) {
45 guess_remote = git_config_bool(var, value);
49 return git_default_config(var, value, cb);
52 static int delete_git_dir(const char *id)
54 struct strbuf sb = STRBUF_INIT;
57 strbuf_addstr(&sb, git_common_path("worktrees/%s", id));
58 ret = remove_dir_recursively(&sb, 0);
59 if (ret < 0 && errno == ENOTDIR)
62 error_errno(_("failed to delete '%s'"), sb.buf);
67 static void delete_worktrees_dir_if_empty(void)
69 rmdir(git_path("worktrees")); /* ignore failed removal */
72 static void prune_worktree(const char *id, const char *reason)
74 if (show_only || verbose)
75 printf_ln(_("Removing %s/%s: %s"), "worktrees", id, reason);
80 static int prune_cmp(const void *a, const void *b)
82 const struct string_list_item *x = a;
83 const struct string_list_item *y = b;
86 if ((c = fspathcmp(x->string, y->string)))
89 * paths same; prune_dupes() removes all but the first worktree entry
90 * having the same path, so sort main worktree ('util' is NULL) above
91 * linked worktrees ('util' not NULL) since main worktree can't be
98 /* paths same; sort by .git/worktrees/<id> */
99 return strcmp(x->util, y->util);
102 static void prune_dups(struct string_list *l)
106 QSORT(l->items, l->nr, prune_cmp);
107 for (i = 1; i < l->nr; i++) {
108 if (!fspathcmp(l->items[i].string, l->items[i - 1].string))
109 prune_worktree(l->items[i].util, "duplicate entry");
113 static void prune_worktrees(void)
115 struct strbuf reason = STRBUF_INIT;
116 struct strbuf main_path = STRBUF_INIT;
117 struct string_list kept = STRING_LIST_INIT_NODUP;
118 DIR *dir = opendir(git_path("worktrees"));
122 while ((d = readdir_skip_dot_and_dotdot(dir)) != NULL) {
124 strbuf_reset(&reason);
125 if (should_prune_worktree(d->d_name, &reason, &path, expire))
126 prune_worktree(d->d_name, reason.buf);
128 string_list_append(&kept, path)->util = xstrdup(d->d_name);
132 strbuf_add_absolute_path(&main_path, get_git_common_dir());
133 /* massage main worktree absolute path to match 'gitdir' content */
134 strbuf_strip_suffix(&main_path, "/.");
135 string_list_append(&kept, strbuf_detach(&main_path, NULL));
137 string_list_clear(&kept, 1);
140 delete_worktrees_dir_if_empty();
141 strbuf_release(&reason);
144 static int prune(int ac, const char **av, const char *prefix)
146 struct option options[] = {
147 OPT__DRY_RUN(&show_only, N_("do not remove, show only")),
148 OPT__VERBOSE(&verbose, N_("report pruned working trees")),
149 OPT_EXPIRY_DATE(0, "expire", &expire,
150 N_("expire working trees older than <time>")),
155 ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
157 usage_with_options(worktree_usage, options);
162 static char *junk_work_tree;
163 static char *junk_git_dir;
165 static pid_t junk_pid;
167 static void remove_junk(void)
169 struct strbuf sb = STRBUF_INIT;
170 if (!is_junk || getpid() != junk_pid)
173 strbuf_addstr(&sb, junk_git_dir);
174 remove_dir_recursively(&sb, 0);
177 if (junk_work_tree) {
178 strbuf_addstr(&sb, junk_work_tree);
179 remove_dir_recursively(&sb, 0);
184 static void remove_junk_on_signal(int signo)
191 static const char *worktree_basename(const char *path, int *olen)
197 while (len && is_dir_sep(path[len - 1]))
200 for (name = path + len - 1; name > path; name--)
201 if (is_dir_sep(*name)) {
210 /* check that path is viable location for worktree */
211 static void check_candidate_path(const char *path,
213 struct worktree **worktrees,
219 if (file_exists(path) && !is_empty_dir(path))
220 die(_("'%s' already exists"), path);
222 wt = find_worktree_by_path(worktrees, path);
226 locked = !!worktree_lock_reason(wt);
227 if ((!locked && force) || (locked && force > 1)) {
228 if (delete_git_dir(wt->id))
229 die(_("unusable worktree destination '%s'"), path);
234 die(_("'%s' is a missing but locked worktree;\nuse '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"), path, cmd);
236 die(_("'%s' is a missing but already registered worktree;\nuse '%s -f' to override, or 'prune' or 'remove' to clear"), path, cmd);
239 static int add_worktree(const char *path, const char *refname,
240 const struct add_opts *opts)
242 struct strbuf sb_git = STRBUF_INIT, sb_repo = STRBUF_INIT;
243 struct strbuf sb = STRBUF_INIT, realpath = STRBUF_INIT;
245 struct child_process cp = CHILD_PROCESS_INIT;
246 struct strvec child_env = STRVEC_INIT;
247 unsigned int counter = 0;
249 struct strbuf symref = STRBUF_INIT;
250 struct commit *commit = NULL;
252 struct strbuf sb_name = STRBUF_INIT;
253 struct worktree **worktrees;
255 worktrees = get_worktrees();
256 check_candidate_path(path, opts->force, worktrees, "add");
257 free_worktrees(worktrees);
260 /* is 'refname' a branch or commit? */
261 if (!opts->detach && !strbuf_check_branch_ref(&symref, refname) &&
262 ref_exists(symref.buf)) {
265 die_if_checked_out(symref.buf, 0);
267 commit = lookup_commit_reference_by_name(refname);
269 die(_("invalid reference: %s"), refname);
271 name = worktree_basename(path, &len);
272 strbuf_add(&sb, name, path + len - name);
273 sanitize_refname_component(sb.buf, &sb_name);
275 BUG("How come '%s' becomes empty after sanitization?", sb.buf);
278 git_path_buf(&sb_repo, "worktrees/%s", name);
280 if (safe_create_leading_directories_const(sb_repo.buf))
281 die_errno(_("could not create leading directories of '%s'"),
284 while (mkdir(sb_repo.buf, 0777)) {
286 if ((errno != EEXIST) || !counter /* overflow */)
287 die_errno(_("could not create directory of '%s'"),
289 strbuf_setlen(&sb_repo, len);
290 strbuf_addf(&sb_repo, "%d", counter);
292 name = strrchr(sb_repo.buf, '/') + 1;
296 sigchain_push_common(remove_junk_on_signal);
298 junk_git_dir = xstrdup(sb_repo.buf);
302 * lock the incomplete repo so prune won't delete it, unlock
303 * after the preparation is over.
305 strbuf_addf(&sb, "%s/locked", sb_repo.buf);
306 if (!opts->keep_locked)
307 write_file(sb.buf, "initializing");
309 write_file(sb.buf, "added with --lock");
311 strbuf_addf(&sb_git, "%s/.git", path);
312 if (safe_create_leading_directories_const(sb_git.buf))
313 die_errno(_("could not create leading directories of '%s'"),
315 junk_work_tree = xstrdup(path);
318 strbuf_addf(&sb, "%s/gitdir", sb_repo.buf);
319 strbuf_realpath(&realpath, sb_git.buf, 1);
320 write_file(sb.buf, "%s", realpath.buf);
321 strbuf_realpath(&realpath, get_git_common_dir(), 1);
322 write_file(sb_git.buf, "gitdir: %s/worktrees/%s",
325 * This is to keep resolve_ref() happy. We need a valid HEAD
326 * or is_git_directory() will reject the directory. Any value which
327 * looks like an object ID will do since it will be immediately
328 * replaced by the symbolic-ref or update-ref invocation in the new
332 strbuf_addf(&sb, "%s/HEAD", sb_repo.buf);
333 write_file(sb.buf, "%s", oid_to_hex(null_oid()));
335 strbuf_addf(&sb, "%s/commondir", sb_repo.buf);
336 write_file(sb.buf, "../..");
338 strvec_pushf(&child_env, "%s=%s", GIT_DIR_ENVIRONMENT, sb_git.buf);
339 strvec_pushf(&child_env, "%s=%s", GIT_WORK_TREE_ENVIRONMENT, path);
343 strvec_pushl(&cp.args, "update-ref", "HEAD",
344 oid_to_hex(&commit->object.oid), NULL);
346 strvec_pushl(&cp.args, "symbolic-ref", "HEAD",
349 strvec_push(&cp.args, "--quiet");
352 cp.env = child_env.v;
353 ret = run_command(&cp);
357 if (opts->checkout) {
359 strvec_clear(&cp.args);
360 strvec_pushl(&cp.args, "reset", "--hard", "--no-recurse-submodules", NULL);
362 strvec_push(&cp.args, "--quiet");
363 cp.env = child_env.v;
364 ret = run_command(&cp);
370 FREE_AND_NULL(junk_work_tree);
371 FREE_AND_NULL(junk_git_dir);
374 if (ret || !opts->keep_locked) {
376 strbuf_addf(&sb, "%s/locked", sb_repo.buf);
377 unlink_or_warn(sb.buf);
381 * Hook failure does not warrant worktree deletion, so run hook after
382 * is_junk is cleared, but do return appropriate code when hook fails.
384 if (!ret && opts->checkout) {
385 struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
387 strvec_pushl(&opt.env, "GIT_DIR", "GIT_WORK_TREE", NULL);
388 strvec_pushl(&opt.args,
389 oid_to_hex(null_oid()),
390 oid_to_hex(&commit->object.oid),
394 opt.absolute_path = 1;
396 ret = run_hooks("post-checkout", &opt);
398 run_hooks_opt_clear(&opt);
401 strvec_clear(&child_env);
403 strbuf_release(&symref);
404 strbuf_release(&sb_repo);
405 strbuf_release(&sb_git);
406 strbuf_release(&sb_name);
407 strbuf_release(&realpath);
411 static void print_preparing_worktree_line(int detach,
413 const char *new_branch,
414 int force_new_branch)
416 if (force_new_branch) {
417 struct commit *commit = lookup_commit_reference_by_name(new_branch);
419 printf_ln(_("Preparing worktree (new branch '%s')"), new_branch);
421 printf_ln(_("Preparing worktree (resetting branch '%s'; was at %s)"),
423 find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV));
424 } else if (new_branch) {
425 printf_ln(_("Preparing worktree (new branch '%s')"), new_branch);
427 struct strbuf s = STRBUF_INIT;
428 if (!detach && !strbuf_check_branch_ref(&s, branch) &&
430 printf_ln(_("Preparing worktree (checking out '%s')"),
433 struct commit *commit = lookup_commit_reference_by_name(branch);
435 die(_("invalid reference: %s"), branch);
436 printf_ln(_("Preparing worktree (detached HEAD %s)"),
437 find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV));
443 static const char *dwim_branch(const char *path, const char **new_branch)
447 const char *s = worktree_basename(path, &n);
448 const char *branchname = xstrndup(s, n);
449 struct strbuf ref = STRBUF_INIT;
453 branch_exists = !strbuf_check_branch_ref(&ref, branchname) &&
455 strbuf_release(&ref);
459 *new_branch = branchname;
461 struct object_id oid;
463 unique_tracking_name(*new_branch, &oid, NULL);
469 static int add(int ac, const char **av, const char *prefix)
471 struct add_opts opts;
472 const char *new_branch_force = NULL;
475 const char *new_branch = NULL;
476 const char *opt_track = NULL;
477 struct option options[] = {
478 OPT__FORCE(&opts.force,
479 N_("checkout <branch> even if already checked out in other worktree"),
480 PARSE_OPT_NOCOMPLETE),
481 OPT_STRING('b', NULL, &new_branch, N_("branch"),
482 N_("create a new branch")),
483 OPT_STRING('B', NULL, &new_branch_force, N_("branch"),
484 N_("create or reset a branch")),
485 OPT_BOOL('d', "detach", &opts.detach, N_("detach HEAD at named commit")),
486 OPT_BOOL(0, "checkout", &opts.checkout, N_("populate the new working tree")),
487 OPT_BOOL(0, "lock", &opts.keep_locked, N_("keep the new working tree locked")),
488 OPT__QUIET(&opts.quiet, N_("suppress progress reporting")),
489 OPT_PASSTHRU(0, "track", &opt_track, NULL,
490 N_("set up tracking mode (see git-branch(1))"),
491 PARSE_OPT_NOARG | PARSE_OPT_OPTARG),
492 OPT_BOOL(0, "guess-remote", &guess_remote,
493 N_("try to match the new branch name with a remote-tracking branch")),
497 memset(&opts, 0, sizeof(opts));
499 ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
500 if (!!opts.detach + !!new_branch + !!new_branch_force > 1)
501 die(_("-b, -B, and --detach are mutually exclusive"));
502 if (ac < 1 || ac > 2)
503 usage_with_options(worktree_usage, options);
505 path = prefix_filename(prefix, av[0]);
506 branch = ac < 2 ? "HEAD" : av[1];
508 if (!strcmp(branch, "-"))
511 if (new_branch_force) {
512 struct strbuf symref = STRBUF_INIT;
514 new_branch = new_branch_force;
517 !strbuf_check_branch_ref(&symref, new_branch) &&
518 ref_exists(symref.buf))
519 die_if_checked_out(symref.buf, 0);
520 strbuf_release(&symref);
523 if (ac < 2 && !new_branch && !opts.detach) {
524 const char *s = dwim_branch(path, &new_branch);
529 if (ac == 2 && !new_branch && !opts.detach) {
530 struct object_id oid;
531 struct commit *commit;
534 commit = lookup_commit_reference_by_name(branch);
536 remote = unique_tracking_name(branch, &oid, NULL);
544 print_preparing_worktree_line(opts.detach, branch, new_branch, !!new_branch_force);
547 struct child_process cp = CHILD_PROCESS_INIT;
549 strvec_push(&cp.args, "branch");
550 if (new_branch_force)
551 strvec_push(&cp.args, "--force");
553 strvec_push(&cp.args, "--quiet");
554 strvec_push(&cp.args, new_branch);
555 strvec_push(&cp.args, branch);
557 strvec_push(&cp.args, opt_track);
558 if (run_command(&cp))
561 } else if (opt_track) {
562 die(_("--[no-]track can only be used if a new branch is created"));
567 return add_worktree(path, branch, &opts);
570 static void show_worktree_porcelain(struct worktree *wt)
574 printf("worktree %s\n", wt->path);
578 printf("HEAD %s\n", oid_to_hex(&wt->head_oid));
580 printf("detached\n");
581 else if (wt->head_ref)
582 printf("branch %s\n", wt->head_ref);
585 reason = worktree_lock_reason(wt);
586 if (reason && *reason) {
587 struct strbuf sb = STRBUF_INIT;
588 quote_c_style(reason, &sb, NULL, 0);
589 printf("locked %s\n", sb.buf);
594 reason = worktree_prune_reason(wt, expire);
596 printf("prunable %s\n", reason);
601 static void show_worktree(struct worktree *wt, int path_maxlen, int abbrev_len)
603 struct strbuf sb = STRBUF_INIT;
604 int cur_path_len = strlen(wt->path);
605 int path_adj = cur_path_len - utf8_strwidth(wt->path);
608 strbuf_addf(&sb, "%-*s ", 1 + path_maxlen + path_adj, wt->path);
610 strbuf_addstr(&sb, "(bare)");
612 strbuf_addf(&sb, "%-*s ", abbrev_len,
613 find_unique_abbrev(&wt->head_oid, DEFAULT_ABBREV));
615 strbuf_addstr(&sb, "(detached HEAD)");
616 else if (wt->head_ref) {
617 char *ref = shorten_unambiguous_ref(wt->head_ref, 0);
618 strbuf_addf(&sb, "[%s]", ref);
621 strbuf_addstr(&sb, "(error)");
624 reason = worktree_lock_reason(wt);
625 if (verbose && reason && *reason)
626 strbuf_addf(&sb, "\n\tlocked: %s", reason);
628 strbuf_addstr(&sb, " locked");
630 reason = worktree_prune_reason(wt, expire);
631 if (verbose && reason)
632 strbuf_addf(&sb, "\n\tprunable: %s", reason);
634 strbuf_addstr(&sb, " prunable");
636 printf("%s\n", sb.buf);
640 static void measure_widths(struct worktree **wt, int *abbrev, int *maxlen)
644 for (i = 0; wt[i]; i++) {
646 int path_len = strlen(wt[i]->path);
648 if (path_len > *maxlen)
650 sha1_len = strlen(find_unique_abbrev(&wt[i]->head_oid, *abbrev));
651 if (sha1_len > *abbrev)
656 static int pathcmp(const void *a_, const void *b_)
658 const struct worktree *const *a = a_;
659 const struct worktree *const *b = b_;
660 return fspathcmp((*a)->path, (*b)->path);
663 static void pathsort(struct worktree **wt)
666 struct worktree **p = wt;
670 QSORT(wt, n, pathcmp);
673 static int list(int ac, const char **av, const char *prefix)
677 struct option options[] = {
678 OPT_BOOL(0, "porcelain", &porcelain, N_("machine-readable output")),
679 OPT__VERBOSE(&verbose, N_("show extended annotations and reasons, if available")),
680 OPT_EXPIRY_DATE(0, "expire", &expire,
681 N_("add 'prunable' annotation to worktrees older than <time>")),
686 ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
688 usage_with_options(worktree_usage, options);
689 else if (verbose && porcelain)
690 die(_("--verbose and --porcelain are mutually exclusive"));
692 struct worktree **worktrees = get_worktrees();
693 int path_maxlen = 0, abbrev = DEFAULT_ABBREV, i;
695 /* sort worktrees by path but keep main worktree at top */
696 pathsort(worktrees + 1);
699 measure_widths(worktrees, &abbrev, &path_maxlen);
701 for (i = 0; worktrees[i]; i++) {
703 show_worktree_porcelain(worktrees[i]);
705 show_worktree(worktrees[i], path_maxlen, abbrev);
707 free_worktrees(worktrees);
712 static int lock_worktree(int ac, const char **av, const char *prefix)
714 const char *reason = "", *old_reason;
715 struct option options[] = {
716 OPT_STRING(0, "reason", &reason, N_("string"),
717 N_("reason for locking")),
720 struct worktree **worktrees, *wt;
722 ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
724 usage_with_options(worktree_usage, options);
726 worktrees = get_worktrees();
727 wt = find_worktree(worktrees, prefix, av[0]);
729 die(_("'%s' is not a working tree"), av[0]);
730 if (is_main_worktree(wt))
731 die(_("The main working tree cannot be locked or unlocked"));
733 old_reason = worktree_lock_reason(wt);
736 die(_("'%s' is already locked, reason: %s"),
738 die(_("'%s' is already locked"), av[0]);
741 write_file(git_common_path("worktrees/%s/locked", wt->id),
743 free_worktrees(worktrees);
747 static int unlock_worktree(int ac, const char **av, const char *prefix)
749 struct option options[] = {
752 struct worktree **worktrees, *wt;
755 ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
757 usage_with_options(worktree_usage, options);
759 worktrees = get_worktrees();
760 wt = find_worktree(worktrees, prefix, av[0]);
762 die(_("'%s' is not a working tree"), av[0]);
763 if (is_main_worktree(wt))
764 die(_("The main working tree cannot be locked or unlocked"));
765 if (!worktree_lock_reason(wt))
766 die(_("'%s' is not locked"), av[0]);
767 ret = unlink_or_warn(git_common_path("worktrees/%s/locked", wt->id));
768 free_worktrees(worktrees);
772 static void validate_no_submodules(const struct worktree *wt)
774 struct index_state istate = { NULL };
775 struct strbuf path = STRBUF_INIT;
776 int i, found_submodules = 0;
778 if (is_directory(worktree_git_path(wt, "modules"))) {
780 * There could be false positives, e.g. the "modules"
781 * directory exists but is empty. But it's a rare case and
782 * this simpler check is probably good enough for now.
784 found_submodules = 1;
785 } else if (read_index_from(&istate, worktree_git_path(wt, "index"),
786 get_worktree_git_dir(wt)) > 0) {
787 for (i = 0; i < istate.cache_nr; i++) {
788 struct cache_entry *ce = istate.cache[i];
791 if (!S_ISGITLINK(ce->ce_mode))
795 strbuf_addf(&path, "%s/%s", wt->path, ce->name);
796 if (!is_submodule_populated_gently(path.buf, &err))
799 found_submodules = 1;
803 discard_index(&istate);
804 strbuf_release(&path);
806 if (found_submodules)
807 die(_("working trees containing submodules cannot be moved or removed"));
810 static int move_worktree(int ac, const char **av, const char *prefix)
813 struct option options[] = {
815 N_("force move even if worktree is dirty or locked"),
816 PARSE_OPT_NOCOMPLETE),
819 struct worktree **worktrees, *wt;
820 struct strbuf dst = STRBUF_INIT;
821 struct strbuf errmsg = STRBUF_INIT;
822 const char *reason = NULL;
825 ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
827 usage_with_options(worktree_usage, options);
829 path = prefix_filename(prefix, av[1]);
830 strbuf_addstr(&dst, path);
833 worktrees = get_worktrees();
834 wt = find_worktree(worktrees, prefix, av[0]);
836 die(_("'%s' is not a working tree"), av[0]);
837 if (is_main_worktree(wt))
838 die(_("'%s' is a main working tree"), av[0]);
839 if (is_directory(dst.buf)) {
840 const char *sep = find_last_dir_sep(wt->path);
843 die(_("could not figure out destination name from '%s'"),
845 strbuf_trim_trailing_dir_sep(&dst);
846 strbuf_addstr(&dst, sep);
848 check_candidate_path(dst.buf, force, worktrees, "move");
850 validate_no_submodules(wt);
853 reason = worktree_lock_reason(wt);
856 die(_("cannot move a locked working tree, lock reason: %s\nuse 'move -f -f' to override or unlock first"),
858 die(_("cannot move a locked working tree;\nuse 'move -f -f' to override or unlock first"));
860 if (validate_worktree(wt, &errmsg, 0))
861 die(_("validation failed, cannot move working tree: %s"),
863 strbuf_release(&errmsg);
865 if (rename(wt->path, dst.buf) == -1)
866 die_errno(_("failed to move '%s' to '%s'"), wt->path, dst.buf);
868 update_worktree_location(wt, dst.buf);
870 strbuf_release(&dst);
871 free_worktrees(worktrees);
876 * Note, "git status --porcelain" is used to determine if it's safe to
877 * delete a whole worktree. "git status" does not ignore user
878 * configuration, so if a normal "git status" shows "clean" for the
879 * user, then it's ok to remove it.
881 * This assumption may be a bad one. We may want to ignore
882 * (potentially bad) user settings and only delete a worktree when
883 * it's absolutely safe to do so from _our_ point of view because we
886 static void check_clean_worktree(struct worktree *wt,
887 const char *original_path)
889 struct child_process cp;
894 * Until we sort this out, all submodules are "dirty" and
895 * will abort this function.
897 validate_no_submodules(wt);
899 child_process_init(&cp);
900 strvec_pushf(&cp.env_array, "%s=%s/.git",
901 GIT_DIR_ENVIRONMENT, wt->path);
902 strvec_pushf(&cp.env_array, "%s=%s",
903 GIT_WORK_TREE_ENVIRONMENT, wt->path);
904 strvec_pushl(&cp.args, "status",
905 "--porcelain", "--ignore-submodules=none",
910 ret = start_command(&cp);
912 die_errno(_("failed to run 'git status' on '%s'"),
914 ret = xread(cp.out, buf, sizeof(buf));
916 die(_("'%s' contains modified or untracked files, use --force to delete it"),
919 ret = finish_command(&cp);
921 die_errno(_("failed to run 'git status' on '%s', code %d"),
925 static int delete_git_work_tree(struct worktree *wt)
927 struct strbuf sb = STRBUF_INIT;
930 strbuf_addstr(&sb, wt->path);
931 if (remove_dir_recursively(&sb, 0)) {
932 error_errno(_("failed to delete '%s'"), sb.buf);
939 static int remove_worktree(int ac, const char **av, const char *prefix)
942 struct option options[] = {
944 N_("force removal even if worktree is dirty or locked"),
945 PARSE_OPT_NOCOMPLETE),
948 struct worktree **worktrees, *wt;
949 struct strbuf errmsg = STRBUF_INIT;
950 const char *reason = NULL;
953 ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
955 usage_with_options(worktree_usage, options);
957 worktrees = get_worktrees();
958 wt = find_worktree(worktrees, prefix, av[0]);
960 die(_("'%s' is not a working tree"), av[0]);
961 if (is_main_worktree(wt))
962 die(_("'%s' is a main working tree"), av[0]);
964 reason = worktree_lock_reason(wt);
967 die(_("cannot remove a locked working tree, lock reason: %s\nuse 'remove -f -f' to override or unlock first"),
969 die(_("cannot remove a locked working tree;\nuse 'remove -f -f' to override or unlock first"));
971 if (validate_worktree(wt, &errmsg, WT_VALIDATE_WORKTREE_MISSING_OK))
972 die(_("validation failed, cannot remove working tree: %s"),
974 strbuf_release(&errmsg);
976 if (file_exists(wt->path)) {
978 check_clean_worktree(wt, av[0]);
980 ret |= delete_git_work_tree(wt);
983 * continue on even if ret is non-zero, there's no going back
986 ret |= delete_git_dir(wt->id);
987 delete_worktrees_dir_if_empty();
989 free_worktrees(worktrees);
993 static void report_repair(int iserr, const char *path, const char *msg, void *cb_data)
996 printf_ln(_("repair: %s: %s"), msg, path);
998 int *exit_status = (int *)cb_data;
999 fprintf_ln(stderr, _("error: %s: %s"), msg, path);
1004 static int repair(int ac, const char **av, const char *prefix)
1007 const char *self[] = { ".", NULL };
1008 struct option options[] = {
1013 ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
1014 p = ac > 0 ? av : self;
1016 repair_worktree_at_path(*p, report_repair, &rc);
1017 repair_worktrees(report_repair, &rc);
1021 int cmd_worktree(int ac, const char **av, const char *prefix)
1023 struct option options[] = {
1027 git_config(git_worktree_config, NULL);
1030 usage_with_options(worktree_usage, options);
1033 if (!strcmp(av[1], "add"))
1034 return add(ac - 1, av + 1, prefix);
1035 if (!strcmp(av[1], "prune"))
1036 return prune(ac - 1, av + 1, prefix);
1037 if (!strcmp(av[1], "list"))
1038 return list(ac - 1, av + 1, prefix);
1039 if (!strcmp(av[1], "lock"))
1040 return lock_worktree(ac - 1, av + 1, prefix);
1041 if (!strcmp(av[1], "unlock"))
1042 return unlock_worktree(ac - 1, av + 1, prefix);
1043 if (!strcmp(av[1], "move"))
1044 return move_worktree(ac - 1, av + 1, prefix);
1045 if (!strcmp(av[1], "remove"))
1046 return remove_worktree(ac - 1, av + 1, prefix);
1047 if (!strcmp(av[1], "repair"))
1048 return repair(ac - 1, av + 1, prefix);
1049 usage_with_options(worktree_usage, options);