6 #include "parse-options.h"
10 #include "run-command.h"
12 #include "submodule.h"
17 static const char * const worktree_usage
[] = {
18 N_("git worktree add [<options>] <path> [<commit-ish>]"),
19 N_("git worktree list [<options>]"),
20 N_("git worktree lock [<options>] <path>"),
21 N_("git worktree move <worktree> <new-path>"),
22 N_("git worktree prune [<options>]"),
23 N_("git worktree remove [<options>] <worktree>"),
24 N_("git worktree unlock <path>"),
38 static int guess_remote
;
39 static timestamp_t expire
;
41 static int git_worktree_config(const char *var
, const char *value
, void *cb
)
43 if (!strcmp(var
, "worktree.guessremote")) {
44 guess_remote
= git_config_bool(var
, value
);
48 return git_default_config(var
, value
, cb
);
51 static int delete_git_dir(const char *id
)
53 struct strbuf sb
= STRBUF_INIT
;
56 strbuf_addstr(&sb
, git_common_path("worktrees/%s", id
));
57 ret
= remove_dir_recursively(&sb
, 0);
58 if (ret
< 0 && errno
== ENOTDIR
)
61 error_errno(_("failed to delete '%s'"), sb
.buf
);
66 static void delete_worktrees_dir_if_empty(void)
68 rmdir(git_path("worktrees")); /* ignore failed removal */
71 static void prune_worktree(const char *id
, const char *reason
)
73 if (show_only
|| verbose
)
74 printf_ln(_("Removing %s/%s: %s"), "worktrees", id
, reason
);
79 static int prune_cmp(const void *a
, const void *b
)
81 const struct string_list_item
*x
= a
;
82 const struct string_list_item
*y
= b
;
85 if ((c
= fspathcmp(x
->string
, y
->string
)))
88 * paths same; prune_dupes() removes all but the first worktree entry
89 * having the same path, so sort main worktree ('util' is NULL) above
90 * linked worktrees ('util' not NULL) since main worktree can't be
97 /* paths same; sort by .git/worktrees/<id> */
98 return strcmp(x
->util
, y
->util
);
101 static void prune_dups(struct string_list
*l
)
105 QSORT(l
->items
, l
->nr
, prune_cmp
);
106 for (i
= 1; i
< l
->nr
; i
++) {
107 if (!fspathcmp(l
->items
[i
].string
, l
->items
[i
- 1].string
))
108 prune_worktree(l
->items
[i
].util
, "duplicate entry");
112 static void prune_worktrees(void)
114 struct strbuf reason
= STRBUF_INIT
;
115 struct strbuf main_path
= STRBUF_INIT
;
116 struct string_list kept
= STRING_LIST_INIT_NODUP
;
117 DIR *dir
= opendir(git_path("worktrees"));
121 while ((d
= readdir(dir
)) != NULL
) {
123 if (is_dot_or_dotdot(d
->d_name
))
125 strbuf_reset(&reason
);
126 if (should_prune_worktree(d
->d_name
, &reason
, &path
, expire
))
127 prune_worktree(d
->d_name
, reason
.buf
);
129 string_list_append(&kept
, path
)->util
= xstrdup(d
->d_name
);
133 strbuf_add_absolute_path(&main_path
, get_git_common_dir());
134 /* massage main worktree absolute path to match 'gitdir' content */
135 strbuf_strip_suffix(&main_path
, "/.");
136 string_list_append(&kept
, strbuf_detach(&main_path
, NULL
));
138 string_list_clear(&kept
, 1);
141 delete_worktrees_dir_if_empty();
142 strbuf_release(&reason
);
145 static int prune(int ac
, const char **av
, const char *prefix
)
147 struct option options
[] = {
148 OPT__DRY_RUN(&show_only
, N_("do not remove, show only")),
149 OPT__VERBOSE(&verbose
, N_("report pruned working trees")),
150 OPT_EXPIRY_DATE(0, "expire", &expire
,
151 N_("expire working trees older than <time>")),
156 ac
= parse_options(ac
, av
, prefix
, options
, worktree_usage
, 0);
158 usage_with_options(worktree_usage
, options
);
163 static char *junk_work_tree
;
164 static char *junk_git_dir
;
166 static pid_t junk_pid
;
168 static void remove_junk(void)
170 struct strbuf sb
= STRBUF_INIT
;
171 if (!is_junk
|| getpid() != junk_pid
)
174 strbuf_addstr(&sb
, junk_git_dir
);
175 remove_dir_recursively(&sb
, 0);
178 if (junk_work_tree
) {
179 strbuf_addstr(&sb
, junk_work_tree
);
180 remove_dir_recursively(&sb
, 0);
185 static void remove_junk_on_signal(int signo
)
192 static const char *worktree_basename(const char *path
, int *olen
)
198 while (len
&& is_dir_sep(path
[len
- 1]))
201 for (name
= path
+ len
- 1; name
> path
; name
--)
202 if (is_dir_sep(*name
)) {
211 /* check that path is viable location for worktree */
212 static void check_candidate_path(const char *path
,
214 struct worktree
**worktrees
,
220 if (file_exists(path
) && !is_empty_dir(path
))
221 die(_("'%s' already exists"), path
);
223 wt
= find_worktree_by_path(worktrees
, path
);
227 locked
= !!worktree_lock_reason(wt
);
228 if ((!locked
&& force
) || (locked
&& force
> 1)) {
229 if (delete_git_dir(wt
->id
))
230 die(_("unusable worktree destination '%s'"), path
);
235 die(_("'%s' is a missing but locked worktree;\nuse '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"), path
, cmd
);
237 die(_("'%s' is a missing but already registered worktree;\nuse '%s -f' to override, or 'prune' or 'remove' to clear"), path
, cmd
);
240 static int add_worktree(const char *path
, const char *refname
,
241 const struct add_opts
*opts
)
243 struct strbuf sb_git
= STRBUF_INIT
, sb_repo
= STRBUF_INIT
;
244 struct strbuf sb
= STRBUF_INIT
, realpath
= STRBUF_INIT
;
246 struct child_process cp
= CHILD_PROCESS_INIT
;
247 struct strvec child_env
= STRVEC_INIT
;
248 unsigned int counter
= 0;
250 struct strbuf symref
= STRBUF_INIT
;
251 struct commit
*commit
= NULL
;
253 struct strbuf sb_name
= STRBUF_INIT
;
254 struct worktree
**worktrees
;
256 worktrees
= get_worktrees();
257 check_candidate_path(path
, opts
->force
, worktrees
, "add");
258 free_worktrees(worktrees
);
261 /* is 'refname' a branch or commit? */
262 if (!opts
->detach
&& !strbuf_check_branch_ref(&symref
, refname
) &&
263 ref_exists(symref
.buf
)) {
266 die_if_checked_out(symref
.buf
, 0);
268 commit
= lookup_commit_reference_by_name(refname
);
270 die(_("invalid reference: %s"), refname
);
272 name
= worktree_basename(path
, &len
);
273 strbuf_add(&sb
, name
, path
+ len
- name
);
274 sanitize_refname_component(sb
.buf
, &sb_name
);
276 BUG("How come '%s' becomes empty after sanitization?", sb
.buf
);
279 git_path_buf(&sb_repo
, "worktrees/%s", name
);
281 if (safe_create_leading_directories_const(sb_repo
.buf
))
282 die_errno(_("could not create leading directories of '%s'"),
285 while (mkdir(sb_repo
.buf
, 0777)) {
287 if ((errno
!= EEXIST
) || !counter
/* overflow */)
288 die_errno(_("could not create directory of '%s'"),
290 strbuf_setlen(&sb_repo
, len
);
291 strbuf_addf(&sb_repo
, "%d", counter
);
293 name
= strrchr(sb_repo
.buf
, '/') + 1;
297 sigchain_push_common(remove_junk_on_signal
);
299 junk_git_dir
= xstrdup(sb_repo
.buf
);
303 * lock the incomplete repo so prune won't delete it, unlock
304 * after the preparation is over.
306 strbuf_addf(&sb
, "%s/locked", sb_repo
.buf
);
307 if (!opts
->keep_locked
)
308 write_file(sb
.buf
, "initializing");
310 write_file(sb
.buf
, "added with --lock");
312 strbuf_addf(&sb_git
, "%s/.git", path
);
313 if (safe_create_leading_directories_const(sb_git
.buf
))
314 die_errno(_("could not create leading directories of '%s'"),
316 junk_work_tree
= xstrdup(path
);
319 strbuf_addf(&sb
, "%s/gitdir", sb_repo
.buf
);
320 strbuf_realpath(&realpath
, sb_git
.buf
, 1);
321 write_file(sb
.buf
, "%s", realpath
.buf
);
322 strbuf_realpath(&realpath
, get_git_common_dir(), 1);
323 write_file(sb_git
.buf
, "gitdir: %s/worktrees/%s",
326 * This is to keep resolve_ref() happy. We need a valid HEAD
327 * or is_git_directory() will reject the directory. Any value which
328 * looks like an object ID will do since it will be immediately
329 * replaced by the symbolic-ref or update-ref invocation in the new
333 strbuf_addf(&sb
, "%s/HEAD", sb_repo
.buf
);
334 write_file(sb
.buf
, "%s", oid_to_hex(&null_oid
));
336 strbuf_addf(&sb
, "%s/commondir", sb_repo
.buf
);
337 write_file(sb
.buf
, "../..");
339 strvec_pushf(&child_env
, "%s=%s", GIT_DIR_ENVIRONMENT
, sb_git
.buf
);
340 strvec_pushf(&child_env
, "%s=%s", GIT_WORK_TREE_ENVIRONMENT
, path
);
344 strvec_pushl(&cp
.args
, "update-ref", "HEAD",
345 oid_to_hex(&commit
->object
.oid
), NULL
);
347 strvec_pushl(&cp
.args
, "symbolic-ref", "HEAD",
350 strvec_push(&cp
.args
, "--quiet");
353 cp
.env
= child_env
.v
;
354 ret
= run_command(&cp
);
358 if (opts
->checkout
) {
360 strvec_clear(&cp
.args
);
361 strvec_pushl(&cp
.args
, "reset", "--hard", "--no-recurse-submodules", NULL
);
363 strvec_push(&cp
.args
, "--quiet");
364 cp
.env
= child_env
.v
;
365 ret
= run_command(&cp
);
371 FREE_AND_NULL(junk_work_tree
);
372 FREE_AND_NULL(junk_git_dir
);
375 if (ret
|| !opts
->keep_locked
) {
377 strbuf_addf(&sb
, "%s/locked", sb_repo
.buf
);
378 unlink_or_warn(sb
.buf
);
382 * Hook failure does not warrant worktree deletion, so run hook after
383 * is_junk is cleared, but do return appropriate code when hook fails.
385 if (!ret
&& opts
->checkout
) {
386 const char *hook
= find_hook("post-checkout");
388 const char *env
[] = { "GIT_DIR", "GIT_WORK_TREE", NULL
};
391 cp
.stdout_to_stderr
= 1;
395 cp
.trace2_hook_name
= "post-checkout";
396 strvec_pushl(&cp
.args
, absolute_path(hook
),
397 oid_to_hex(&null_oid
),
398 oid_to_hex(&commit
->object
.oid
),
400 ret
= run_command(&cp
);
404 strvec_clear(&child_env
);
406 strbuf_release(&symref
);
407 strbuf_release(&sb_repo
);
408 strbuf_release(&sb_git
);
409 strbuf_release(&sb_name
);
410 strbuf_release(&realpath
);
414 static void print_preparing_worktree_line(int detach
,
416 const char *new_branch
,
417 int force_new_branch
)
419 if (force_new_branch
) {
420 struct commit
*commit
= lookup_commit_reference_by_name(new_branch
);
422 printf_ln(_("Preparing worktree (new branch '%s')"), new_branch
);
424 printf_ln(_("Preparing worktree (resetting branch '%s'; was at %s)"),
426 find_unique_abbrev(&commit
->object
.oid
, DEFAULT_ABBREV
));
427 } else if (new_branch
) {
428 printf_ln(_("Preparing worktree (new branch '%s')"), new_branch
);
430 struct strbuf s
= STRBUF_INIT
;
431 if (!detach
&& !strbuf_check_branch_ref(&s
, branch
) &&
433 printf_ln(_("Preparing worktree (checking out '%s')"),
436 struct commit
*commit
= lookup_commit_reference_by_name(branch
);
438 die(_("invalid reference: %s"), branch
);
439 printf_ln(_("Preparing worktree (detached HEAD %s)"),
440 find_unique_abbrev(&commit
->object
.oid
, DEFAULT_ABBREV
));
446 static const char *dwim_branch(const char *path
, const char **new_branch
)
449 const char *s
= worktree_basename(path
, &n
);
450 const char *branchname
= xstrndup(s
, n
);
451 struct strbuf ref
= STRBUF_INIT
;
454 if (!strbuf_check_branch_ref(&ref
, branchname
) &&
455 ref_exists(ref
.buf
)) {
456 strbuf_release(&ref
);
460 *new_branch
= branchname
;
462 struct object_id oid
;
464 unique_tracking_name(*new_branch
, &oid
, NULL
);
470 static int add(int ac
, const char **av
, const char *prefix
)
472 struct add_opts opts
;
473 const char *new_branch_force
= NULL
;
476 const char *new_branch
= NULL
;
477 const char *opt_track
= NULL
;
478 struct option options
[] = {
479 OPT__FORCE(&opts
.force
,
480 N_("checkout <branch> even if already checked out in other worktree"),
481 PARSE_OPT_NOCOMPLETE
),
482 OPT_STRING('b', NULL
, &new_branch
, N_("branch"),
483 N_("create a new branch")),
484 OPT_STRING('B', NULL
, &new_branch_force
, N_("branch"),
485 N_("create or reset a branch")),
486 OPT_BOOL('d', "detach", &opts
.detach
, N_("detach HEAD at named commit")),
487 OPT_BOOL(0, "checkout", &opts
.checkout
, N_("populate the new working tree")),
488 OPT_BOOL(0, "lock", &opts
.keep_locked
, N_("keep the new working tree locked")),
489 OPT__QUIET(&opts
.quiet
, N_("suppress progress reporting")),
490 OPT_PASSTHRU(0, "track", &opt_track
, NULL
,
491 N_("set up tracking mode (see git-branch(1))"),
492 PARSE_OPT_NOARG
| PARSE_OPT_OPTARG
),
493 OPT_BOOL(0, "guess-remote", &guess_remote
,
494 N_("try to match the new branch name with a remote-tracking branch")),
498 memset(&opts
, 0, sizeof(opts
));
500 ac
= parse_options(ac
, av
, prefix
, options
, worktree_usage
, 0);
501 if (!!opts
.detach
+ !!new_branch
+ !!new_branch_force
> 1)
502 die(_("-b, -B, and --detach are mutually exclusive"));
503 if (ac
< 1 || ac
> 2)
504 usage_with_options(worktree_usage
, options
);
506 path
= prefix_filename(prefix
, av
[0]);
507 branch
= ac
< 2 ? "HEAD" : av
[1];
509 if (!strcmp(branch
, "-"))
512 if (new_branch_force
) {
513 struct strbuf symref
= STRBUF_INIT
;
515 new_branch
= new_branch_force
;
518 !strbuf_check_branch_ref(&symref
, new_branch
) &&
519 ref_exists(symref
.buf
))
520 die_if_checked_out(symref
.buf
, 0);
521 strbuf_release(&symref
);
524 if (ac
< 2 && !new_branch
&& !opts
.detach
) {
525 const char *s
= dwim_branch(path
, &new_branch
);
530 if (ac
== 2 && !new_branch
&& !opts
.detach
) {
531 struct object_id oid
;
532 struct commit
*commit
;
535 commit
= lookup_commit_reference_by_name(branch
);
537 remote
= unique_tracking_name(branch
, &oid
, NULL
);
545 print_preparing_worktree_line(opts
.detach
, branch
, new_branch
, !!new_branch_force
);
548 struct child_process cp
= CHILD_PROCESS_INIT
;
550 strvec_push(&cp
.args
, "branch");
551 if (new_branch_force
)
552 strvec_push(&cp
.args
, "--force");
554 strvec_push(&cp
.args
, "--quiet");
555 strvec_push(&cp
.args
, new_branch
);
556 strvec_push(&cp
.args
, branch
);
558 strvec_push(&cp
.args
, opt_track
);
559 if (run_command(&cp
))
562 } else if (opt_track
) {
563 die(_("--[no-]track can only be used if a new branch is created"));
568 return add_worktree(path
, branch
, &opts
);
571 static void show_worktree_porcelain(struct worktree
*wt
)
575 printf("worktree %s\n", wt
->path
);
579 printf("HEAD %s\n", oid_to_hex(&wt
->head_oid
));
581 printf("detached\n");
582 else if (wt
->head_ref
)
583 printf("branch %s\n", wt
->head_ref
);
586 reason
= worktree_lock_reason(wt
);
587 if (reason
&& *reason
) {
588 struct strbuf sb
= STRBUF_INIT
;
589 quote_c_style(reason
, &sb
, NULL
, 0);
590 printf("locked %s\n", sb
.buf
);
595 reason
= worktree_prune_reason(wt
, expire
);
597 printf("prunable %s\n", reason
);
602 static void show_worktree(struct worktree
*wt
, int path_maxlen
, int abbrev_len
)
604 struct strbuf sb
= STRBUF_INIT
;
605 int cur_path_len
= strlen(wt
->path
);
606 int path_adj
= cur_path_len
- utf8_strwidth(wt
->path
);
609 strbuf_addf(&sb
, "%-*s ", 1 + path_maxlen
+ path_adj
, wt
->path
);
611 strbuf_addstr(&sb
, "(bare)");
613 strbuf_addf(&sb
, "%-*s ", abbrev_len
,
614 find_unique_abbrev(&wt
->head_oid
, DEFAULT_ABBREV
));
616 strbuf_addstr(&sb
, "(detached HEAD)");
617 else if (wt
->head_ref
) {
618 char *ref
= shorten_unambiguous_ref(wt
->head_ref
, 0);
619 strbuf_addf(&sb
, "[%s]", ref
);
622 strbuf_addstr(&sb
, "(error)");
625 reason
= worktree_lock_reason(wt
);
626 if (verbose
&& reason
&& *reason
)
627 strbuf_addf(&sb
, "\n\tlocked: %s", reason
);
629 strbuf_addstr(&sb
, " locked");
631 reason
= worktree_prune_reason(wt
, expire
);
632 if (verbose
&& reason
)
633 strbuf_addf(&sb
, "\n\tprunable: %s", reason
);
635 strbuf_addstr(&sb
, " prunable");
637 printf("%s\n", sb
.buf
);
641 static void measure_widths(struct worktree
**wt
, int *abbrev
, int *maxlen
)
645 for (i
= 0; wt
[i
]; i
++) {
647 int path_len
= strlen(wt
[i
]->path
);
649 if (path_len
> *maxlen
)
651 sha1_len
= strlen(find_unique_abbrev(&wt
[i
]->head_oid
, *abbrev
));
652 if (sha1_len
> *abbrev
)
657 static int pathcmp(const void *a_
, const void *b_
)
659 const struct worktree
*const *a
= a_
;
660 const struct worktree
*const *b
= b_
;
661 return fspathcmp((*a
)->path
, (*b
)->path
);
664 static void pathsort(struct worktree
**wt
)
667 struct worktree
**p
= wt
;
671 QSORT(wt
, n
, pathcmp
);
674 static int list(int ac
, const char **av
, const char *prefix
)
678 struct option options
[] = {
679 OPT_BOOL(0, "porcelain", &porcelain
, N_("machine-readable output")),
680 OPT__VERBOSE(&verbose
, N_("show extended annotations and reasons, if available")),
681 OPT_EXPIRY_DATE(0, "expire", &expire
,
682 N_("add 'prunable' annotation to worktrees older than <time>")),
687 ac
= parse_options(ac
, av
, prefix
, options
, worktree_usage
, 0);
689 usage_with_options(worktree_usage
, options
);
690 else if (verbose
&& porcelain
)
691 die(_("--verbose and --porcelain are mutually exclusive"));
693 struct worktree
**worktrees
= get_worktrees();
694 int path_maxlen
= 0, abbrev
= DEFAULT_ABBREV
, i
;
696 /* sort worktrees by path but keep main worktree at top */
697 pathsort(worktrees
+ 1);
700 measure_widths(worktrees
, &abbrev
, &path_maxlen
);
702 for (i
= 0; worktrees
[i
]; i
++) {
704 show_worktree_porcelain(worktrees
[i
]);
706 show_worktree(worktrees
[i
], path_maxlen
, abbrev
);
708 free_worktrees(worktrees
);
713 static int lock_worktree(int ac
, const char **av
, const char *prefix
)
715 const char *reason
= "", *old_reason
;
716 struct option options
[] = {
717 OPT_STRING(0, "reason", &reason
, N_("string"),
718 N_("reason for locking")),
721 struct worktree
**worktrees
, *wt
;
723 ac
= parse_options(ac
, av
, prefix
, options
, worktree_usage
, 0);
725 usage_with_options(worktree_usage
, options
);
727 worktrees
= get_worktrees();
728 wt
= find_worktree(worktrees
, prefix
, av
[0]);
730 die(_("'%s' is not a working tree"), av
[0]);
731 if (is_main_worktree(wt
))
732 die(_("The main working tree cannot be locked or unlocked"));
734 old_reason
= worktree_lock_reason(wt
);
737 die(_("'%s' is already locked, reason: %s"),
739 die(_("'%s' is already locked"), av
[0]);
742 write_file(git_common_path("worktrees/%s/locked", wt
->id
),
744 free_worktrees(worktrees
);
748 static int unlock_worktree(int ac
, const char **av
, const char *prefix
)
750 struct option options
[] = {
753 struct worktree
**worktrees
, *wt
;
756 ac
= parse_options(ac
, av
, prefix
, options
, worktree_usage
, 0);
758 usage_with_options(worktree_usage
, options
);
760 worktrees
= get_worktrees();
761 wt
= find_worktree(worktrees
, prefix
, av
[0]);
763 die(_("'%s' is not a working tree"), av
[0]);
764 if (is_main_worktree(wt
))
765 die(_("The main working tree cannot be locked or unlocked"));
766 if (!worktree_lock_reason(wt
))
767 die(_("'%s' is not locked"), av
[0]);
768 ret
= unlink_or_warn(git_common_path("worktrees/%s/locked", wt
->id
));
769 free_worktrees(worktrees
);
773 static void validate_no_submodules(const struct worktree
*wt
)
775 struct index_state istate
= { NULL
};
776 struct strbuf path
= STRBUF_INIT
;
777 int i
, found_submodules
= 0;
779 if (is_directory(worktree_git_path(wt
, "modules"))) {
781 * There could be false positives, e.g. the "modules"
782 * directory exists but is empty. But it's a rare case and
783 * this simpler check is probably good enough for now.
785 found_submodules
= 1;
786 } else if (read_index_from(&istate
, worktree_git_path(wt
, "index"),
787 get_worktree_git_dir(wt
)) > 0) {
788 for (i
= 0; i
< istate
.cache_nr
; i
++) {
789 struct cache_entry
*ce
= istate
.cache
[i
];
792 if (!S_ISGITLINK(ce
->ce_mode
))
796 strbuf_addf(&path
, "%s/%s", wt
->path
, ce
->name
);
797 if (!is_submodule_populated_gently(path
.buf
, &err
))
800 found_submodules
= 1;
804 discard_index(&istate
);
805 strbuf_release(&path
);
807 if (found_submodules
)
808 die(_("working trees containing submodules cannot be moved or removed"));
811 static int move_worktree(int ac
, const char **av
, const char *prefix
)
814 struct option options
[] = {
816 N_("force move even if worktree is dirty or locked"),
817 PARSE_OPT_NOCOMPLETE
),
820 struct worktree
**worktrees
, *wt
;
821 struct strbuf dst
= STRBUF_INIT
;
822 struct strbuf errmsg
= STRBUF_INIT
;
823 const char *reason
= NULL
;
826 ac
= parse_options(ac
, av
, prefix
, options
, worktree_usage
, 0);
828 usage_with_options(worktree_usage
, options
);
830 path
= prefix_filename(prefix
, av
[1]);
831 strbuf_addstr(&dst
, path
);
834 worktrees
= get_worktrees();
835 wt
= find_worktree(worktrees
, prefix
, av
[0]);
837 die(_("'%s' is not a working tree"), av
[0]);
838 if (is_main_worktree(wt
))
839 die(_("'%s' is a main working tree"), av
[0]);
840 if (is_directory(dst
.buf
)) {
841 const char *sep
= find_last_dir_sep(wt
->path
);
844 die(_("could not figure out destination name from '%s'"),
846 strbuf_trim_trailing_dir_sep(&dst
);
847 strbuf_addstr(&dst
, sep
);
849 check_candidate_path(dst
.buf
, force
, worktrees
, "move");
851 validate_no_submodules(wt
);
854 reason
= worktree_lock_reason(wt
);
857 die(_("cannot move a locked working tree, lock reason: %s\nuse 'move -f -f' to override or unlock first"),
859 die(_("cannot move a locked working tree;\nuse 'move -f -f' to override or unlock first"));
861 if (validate_worktree(wt
, &errmsg
, 0))
862 die(_("validation failed, cannot move working tree: %s"),
864 strbuf_release(&errmsg
);
866 if (rename(wt
->path
, dst
.buf
) == -1)
867 die_errno(_("failed to move '%s' to '%s'"), wt
->path
, dst
.buf
);
869 update_worktree_location(wt
, dst
.buf
);
871 strbuf_release(&dst
);
872 free_worktrees(worktrees
);
877 * Note, "git status --porcelain" is used to determine if it's safe to
878 * delete a whole worktree. "git status" does not ignore user
879 * configuration, so if a normal "git status" shows "clean" for the
880 * user, then it's ok to remove it.
882 * This assumption may be a bad one. We may want to ignore
883 * (potentially bad) user settings and only delete a worktree when
884 * it's absolutely safe to do so from _our_ point of view because we
887 static void check_clean_worktree(struct worktree
*wt
,
888 const char *original_path
)
890 struct child_process cp
;
895 * Until we sort this out, all submodules are "dirty" and
896 * will abort this function.
898 validate_no_submodules(wt
);
900 child_process_init(&cp
);
901 strvec_pushf(&cp
.env_array
, "%s=%s/.git",
902 GIT_DIR_ENVIRONMENT
, wt
->path
);
903 strvec_pushf(&cp
.env_array
, "%s=%s",
904 GIT_WORK_TREE_ENVIRONMENT
, wt
->path
);
905 strvec_pushl(&cp
.args
, "status",
906 "--porcelain", "--ignore-submodules=none",
911 ret
= start_command(&cp
);
913 die_errno(_("failed to run 'git status' on '%s'"),
915 ret
= xread(cp
.out
, buf
, sizeof(buf
));
917 die(_("'%s' contains modified or untracked files, use --force to delete it"),
920 ret
= finish_command(&cp
);
922 die_errno(_("failed to run 'git status' on '%s', code %d"),
926 static int delete_git_work_tree(struct worktree
*wt
)
928 struct strbuf sb
= STRBUF_INIT
;
931 strbuf_addstr(&sb
, wt
->path
);
932 if (remove_dir_recursively(&sb
, 0)) {
933 error_errno(_("failed to delete '%s'"), sb
.buf
);
940 static int remove_worktree(int ac
, const char **av
, const char *prefix
)
943 struct option options
[] = {
945 N_("force removal even if worktree is dirty or locked"),
946 PARSE_OPT_NOCOMPLETE
),
949 struct worktree
**worktrees
, *wt
;
950 struct strbuf errmsg
= STRBUF_INIT
;
951 const char *reason
= NULL
;
954 ac
= parse_options(ac
, av
, prefix
, options
, worktree_usage
, 0);
956 usage_with_options(worktree_usage
, options
);
958 worktrees
= get_worktrees();
959 wt
= find_worktree(worktrees
, prefix
, av
[0]);
961 die(_("'%s' is not a working tree"), av
[0]);
962 if (is_main_worktree(wt
))
963 die(_("'%s' is a main working tree"), av
[0]);
965 reason
= worktree_lock_reason(wt
);
968 die(_("cannot remove a locked working tree, lock reason: %s\nuse 'remove -f -f' to override or unlock first"),
970 die(_("cannot remove a locked working tree;\nuse 'remove -f -f' to override or unlock first"));
972 if (validate_worktree(wt
, &errmsg
, WT_VALIDATE_WORKTREE_MISSING_OK
))
973 die(_("validation failed, cannot remove working tree: %s"),
975 strbuf_release(&errmsg
);
977 if (file_exists(wt
->path
)) {
979 check_clean_worktree(wt
, av
[0]);
981 ret
|= delete_git_work_tree(wt
);
984 * continue on even if ret is non-zero, there's no going back
987 ret
|= delete_git_dir(wt
->id
);
988 delete_worktrees_dir_if_empty();
990 free_worktrees(worktrees
);
994 static void report_repair(int iserr
, const char *path
, const char *msg
, void *cb_data
)
997 printf_ln(_("repair: %s: %s"), msg
, path
);
999 int *exit_status
= (int *)cb_data
;
1000 fprintf_ln(stderr
, _("error: %s: %s"), msg
, path
);
1005 static int repair(int ac
, const char **av
, const char *prefix
)
1008 const char *self
[] = { ".", NULL
};
1009 struct option options
[] = {
1014 ac
= parse_options(ac
, av
, prefix
, options
, worktree_usage
, 0);
1015 p
= ac
> 0 ? av
: self
;
1017 repair_worktree_at_path(*p
, report_repair
, &rc
);
1018 repair_worktrees(report_repair
, &rc
);
1022 int cmd_worktree(int ac
, const char **av
, const char *prefix
)
1024 struct option options
[] = {
1028 git_config(git_worktree_config
, NULL
);
1031 usage_with_options(worktree_usage
, options
);
1034 if (!strcmp(av
[1], "add"))
1035 return add(ac
- 1, av
+ 1, prefix
);
1036 if (!strcmp(av
[1], "prune"))
1037 return prune(ac
- 1, av
+ 1, prefix
);
1038 if (!strcmp(av
[1], "list"))
1039 return list(ac
- 1, av
+ 1, prefix
);
1040 if (!strcmp(av
[1], "lock"))
1041 return lock_worktree(ac
- 1, av
+ 1, prefix
);
1042 if (!strcmp(av
[1], "unlock"))
1043 return unlock_worktree(ac
- 1, av
+ 1, prefix
);
1044 if (!strcmp(av
[1], "move"))
1045 return move_worktree(ac
- 1, av
+ 1, prefix
);
1046 if (!strcmp(av
[1], "remove"))
1047 return remove_worktree(ac
- 1, av
+ 1, prefix
);
1048 if (!strcmp(av
[1], "repair"))
1049 return repair(ac
- 1, av
+ 1, prefix
);
1050 usage_with_options(worktree_usage
, options
);