1 #define USE_THE_REPOSITORY_VARIABLE
9 #include "environment.h"
12 #include "object-file.h"
13 #include "object-name.h"
14 #include "parse-options.h"
18 #include "read-cache-ll.h"
21 #include "run-command.h"
24 #include "submodule.h"
29 #define BUILTIN_WORKTREE_ADD_USAGE \
30 N_("git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n" \
31 " [--orphan] [(-b | -B) <new-branch>] <path> [<commit-ish>]")
33 #define BUILTIN_WORKTREE_LIST_USAGE \
34 N_("git worktree list [-v | --porcelain [-z]]")
35 #define BUILTIN_WORKTREE_LOCK_USAGE \
36 N_("git worktree lock [--reason <string>] <worktree>")
37 #define BUILTIN_WORKTREE_MOVE_USAGE \
38 N_("git worktree move <worktree> <new-path>")
39 #define BUILTIN_WORKTREE_PRUNE_USAGE \
40 N_("git worktree prune [-n] [-v] [--expire <expire>]")
41 #define BUILTIN_WORKTREE_REMOVE_USAGE \
42 N_("git worktree remove [-f] <worktree>")
43 #define BUILTIN_WORKTREE_REPAIR_USAGE \
44 N_("git worktree repair [<path>...]")
45 #define BUILTIN_WORKTREE_UNLOCK_USAGE \
46 N_("git worktree unlock <worktree>")
48 #define WORKTREE_ADD_DWIM_ORPHAN_INFER_TEXT \
49 _("No possible source branch, inferring '--orphan'")
51 #define WORKTREE_ADD_ORPHAN_WITH_DASH_B_HINT_TEXT \
52 _("If you meant to create a worktree containing a new unborn branch\n" \
53 "(branch with no commits) for this repository, you can do so\n" \
54 "using the --orphan flag:\n" \
56 " git worktree add --orphan -b %s %s\n")
58 #define WORKTREE_ADD_ORPHAN_NO_DASH_B_HINT_TEXT \
59 _("If you meant to create a worktree containing a new unborn branch\n" \
60 "(branch with no commits) for this repository, you can do so\n" \
61 "using the --orphan flag:\n" \
63 " git worktree add --orphan %s\n")
65 static const char * const git_worktree_usage
[] = {
66 BUILTIN_WORKTREE_ADD_USAGE
,
67 BUILTIN_WORKTREE_LIST_USAGE
,
68 BUILTIN_WORKTREE_LOCK_USAGE
,
69 BUILTIN_WORKTREE_MOVE_USAGE
,
70 BUILTIN_WORKTREE_PRUNE_USAGE
,
71 BUILTIN_WORKTREE_REMOVE_USAGE
,
72 BUILTIN_WORKTREE_REPAIR_USAGE
,
73 BUILTIN_WORKTREE_UNLOCK_USAGE
,
77 static const char * const git_worktree_add_usage
[] = {
78 BUILTIN_WORKTREE_ADD_USAGE
,
82 static const char * const git_worktree_list_usage
[] = {
83 BUILTIN_WORKTREE_LIST_USAGE
,
87 static const char * const git_worktree_lock_usage
[] = {
88 BUILTIN_WORKTREE_LOCK_USAGE
,
92 static const char * const git_worktree_move_usage
[] = {
93 BUILTIN_WORKTREE_MOVE_USAGE
,
97 static const char * const git_worktree_prune_usage
[] = {
98 BUILTIN_WORKTREE_PRUNE_USAGE
,
102 static const char * const git_worktree_remove_usage
[] = {
103 BUILTIN_WORKTREE_REMOVE_USAGE
,
107 static const char * const git_worktree_repair_usage
[] = {
108 BUILTIN_WORKTREE_REPAIR_USAGE
,
112 static const char * const git_worktree_unlock_usage
[] = {
113 BUILTIN_WORKTREE_UNLOCK_USAGE
,
123 const char *keep_locked
;
126 static int show_only
;
128 static int guess_remote
;
129 static timestamp_t expire
;
131 static int git_worktree_config(const char *var
, const char *value
,
132 const struct config_context
*ctx
, void *cb
)
134 if (!strcmp(var
, "worktree.guessremote")) {
135 guess_remote
= git_config_bool(var
, value
);
139 return git_default_config(var
, value
, ctx
, cb
);
142 static int delete_git_dir(const char *id
)
144 struct strbuf sb
= STRBUF_INIT
;
147 strbuf_addstr(&sb
, git_common_path("worktrees/%s", id
));
148 ret
= remove_dir_recursively(&sb
, 0);
149 if (ret
< 0 && errno
== ENOTDIR
)
150 ret
= unlink(sb
.buf
);
152 error_errno(_("failed to delete '%s'"), sb
.buf
);
157 static void delete_worktrees_dir_if_empty(void)
159 rmdir(git_path("worktrees")); /* ignore failed removal */
162 static void prune_worktree(const char *id
, const char *reason
)
164 if (show_only
|| verbose
)
165 fprintf_ln(stderr
, _("Removing %s/%s: %s"), "worktrees", id
, reason
);
170 static int prune_cmp(const void *a
, const void *b
)
172 const struct string_list_item
*x
= a
;
173 const struct string_list_item
*y
= b
;
176 if ((c
= fspathcmp(x
->string
, y
->string
)))
179 * paths same; prune_dupes() removes all but the first worktree entry
180 * having the same path, so sort main worktree ('util' is NULL) above
181 * linked worktrees ('util' not NULL) since main worktree can't be
188 /* paths same; sort by .git/worktrees/<id> */
189 return strcmp(x
->util
, y
->util
);
192 static void prune_dups(struct string_list
*l
)
196 QSORT(l
->items
, l
->nr
, prune_cmp
);
197 for (i
= 1; i
< l
->nr
; i
++) {
198 if (!fspathcmp(l
->items
[i
].string
, l
->items
[i
- 1].string
))
199 prune_worktree(l
->items
[i
].util
, "duplicate entry");
203 static void prune_worktrees(void)
205 struct strbuf reason
= STRBUF_INIT
;
206 struct strbuf main_path
= STRBUF_INIT
;
207 struct string_list kept
= STRING_LIST_INIT_DUP
;
208 DIR *dir
= opendir(git_path("worktrees"));
212 while ((d
= readdir_skip_dot_and_dotdot(dir
)) != NULL
) {
214 strbuf_reset(&reason
);
215 if (should_prune_worktree(d
->d_name
, &reason
, &path
, expire
))
216 prune_worktree(d
->d_name
, reason
.buf
);
218 string_list_append_nodup(&kept
, path
)->util
= xstrdup(d
->d_name
);
222 strbuf_add_absolute_path(&main_path
, repo_get_common_dir(the_repository
));
223 /* massage main worktree absolute path to match 'gitdir' content */
224 strbuf_strip_suffix(&main_path
, "/.");
225 string_list_append_nodup(&kept
, strbuf_detach(&main_path
, NULL
));
227 string_list_clear(&kept
, 1);
230 delete_worktrees_dir_if_empty();
231 strbuf_release(&reason
);
234 static int prune(int ac
, const char **av
, const char *prefix
)
236 struct option options
[] = {
237 OPT__DRY_RUN(&show_only
, N_("do not remove, show only")),
238 OPT__VERBOSE(&verbose
, N_("report pruned working trees")),
239 OPT_EXPIRY_DATE(0, "expire", &expire
,
240 N_("expire working trees older than <time>")),
245 ac
= parse_options(ac
, av
, prefix
, options
, git_worktree_prune_usage
,
248 usage_with_options(git_worktree_prune_usage
, options
);
253 static char *junk_work_tree
;
254 static char *junk_git_dir
;
256 static pid_t junk_pid
;
258 static void remove_junk(void)
260 struct strbuf sb
= STRBUF_INIT
;
261 if (!is_junk
|| getpid() != junk_pid
)
264 strbuf_addstr(&sb
, junk_git_dir
);
265 remove_dir_recursively(&sb
, 0);
268 if (junk_work_tree
) {
269 strbuf_addstr(&sb
, junk_work_tree
);
270 remove_dir_recursively(&sb
, 0);
275 static void remove_junk_on_signal(int signo
)
282 static const char *worktree_basename(const char *path
, int *olen
)
288 while (len
&& is_dir_sep(path
[len
- 1]))
291 for (name
= path
+ len
- 1; name
> path
; name
--)
292 if (is_dir_sep(*name
)) {
301 /* check that path is viable location for worktree */
302 static void check_candidate_path(const char *path
,
304 struct worktree
**worktrees
,
310 if (file_exists(path
) && !is_empty_dir(path
))
311 die(_("'%s' already exists"), path
);
313 wt
= find_worktree_by_path(worktrees
, path
);
317 locked
= !!worktree_lock_reason(wt
);
318 if ((!locked
&& force
) || (locked
&& force
> 1)) {
319 if (delete_git_dir(wt
->id
))
320 die(_("unusable worktree destination '%s'"), path
);
325 die(_("'%s' is a missing but locked worktree;\nuse '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"), path
, cmd
);
327 die(_("'%s' is a missing but already registered worktree;\nuse '%s -f' to override, or 'prune' or 'remove' to clear"), path
, cmd
);
330 static void copy_sparse_checkout(const char *worktree_git_dir
)
332 char *from_file
= git_pathdup("info/sparse-checkout");
333 char *to_file
= xstrfmt("%s/info/sparse-checkout", worktree_git_dir
);
335 if (file_exists(from_file
)) {
336 if (safe_create_leading_directories(to_file
) ||
337 copy_file(to_file
, from_file
, 0666))
338 error(_("failed to copy '%s' to '%s'; sparse-checkout may not work correctly"),
346 static void copy_filtered_worktree_config(const char *worktree_git_dir
)
348 char *from_file
= git_pathdup("config.worktree");
349 char *to_file
= xstrfmt("%s/config.worktree", worktree_git_dir
);
351 if (file_exists(from_file
)) {
352 struct config_set cs
= { { 0 } };
355 if (safe_create_leading_directories(to_file
) ||
356 copy_file(to_file
, from_file
, 0666)) {
357 error(_("failed to copy worktree config from '%s' to '%s'"),
359 goto worktree_copy_cleanup
;
362 git_configset_init(&cs
);
363 git_configset_add_file(&cs
, from_file
);
365 if (!git_configset_get_bool(&cs
, "core.bare", &bare
) &&
367 git_config_set_multivar_in_file_gently(
368 to_file
, "core.bare", NULL
, "true", NULL
, 0))
369 error(_("failed to unset '%s' in '%s'"),
370 "core.bare", to_file
);
371 if (!git_configset_get(&cs
, "core.worktree") &&
372 git_config_set_in_file_gently(to_file
,
373 "core.worktree", NULL
, NULL
))
374 error(_("failed to unset '%s' in '%s'"),
375 "core.worktree", to_file
);
377 git_configset_clear(&cs
);
380 worktree_copy_cleanup
:
385 static int checkout_worktree(const struct add_opts
*opts
,
386 struct strvec
*child_env
)
388 struct child_process cp
= CHILD_PROCESS_INIT
;
390 strvec_pushl(&cp
.args
, "reset", "--hard", "--no-recurse-submodules", NULL
);
392 strvec_push(&cp
.args
, "--quiet");
393 strvec_pushv(&cp
.env
, child_env
->v
);
394 return run_command(&cp
);
397 static int make_worktree_orphan(const char * ref
, const struct add_opts
*opts
,
398 struct strvec
*child_env
)
400 struct strbuf symref
= STRBUF_INIT
;
401 struct child_process cp
= CHILD_PROCESS_INIT
;
403 validate_new_branchname(ref
, &symref
, 0);
404 strvec_pushl(&cp
.args
, "symbolic-ref", "HEAD", symref
.buf
, NULL
);
406 strvec_push(&cp
.args
, "--quiet");
407 strvec_pushv(&cp
.env
, child_env
->v
);
408 strbuf_release(&symref
);
410 return run_command(&cp
);
413 static int add_worktree(const char *path
, const char *refname
,
414 const struct add_opts
*opts
)
416 struct strbuf sb_git
= STRBUF_INIT
, sb_repo
= STRBUF_INIT
;
417 struct strbuf sb
= STRBUF_INIT
, realpath
= STRBUF_INIT
;
419 struct strvec child_env
= STRVEC_INIT
;
420 unsigned int counter
= 0;
422 struct strbuf symref
= STRBUF_INIT
;
423 struct commit
*commit
= NULL
;
425 struct strbuf sb_name
= STRBUF_INIT
;
426 struct worktree
**worktrees
, *wt
= NULL
;
427 struct ref_store
*wt_refs
;
429 worktrees
= get_worktrees();
430 check_candidate_path(path
, opts
->force
, worktrees
, "add");
431 free_worktrees(worktrees
);
434 /* is 'refname' a branch or commit? */
435 if (!opts
->detach
&& !strbuf_check_branch_ref(&symref
, refname
) &&
436 refs_ref_exists(get_main_ref_store(the_repository
), symref
.buf
)) {
439 die_if_checked_out(symref
.buf
, 0);
441 commit
= lookup_commit_reference_by_name(refname
);
442 if (!commit
&& !opts
->orphan
)
443 die(_("invalid reference: %s"), refname
);
445 name
= worktree_basename(path
, &len
);
446 strbuf_add(&sb
, name
, path
+ len
- name
);
447 sanitize_refname_component(sb
.buf
, &sb_name
);
449 BUG("How come '%s' becomes empty after sanitization?", sb
.buf
);
452 git_path_buf(&sb_repo
, "worktrees/%s", name
);
454 if (safe_create_leading_directories_const(sb_repo
.buf
))
455 die_errno(_("could not create leading directories of '%s'"),
458 while (mkdir(sb_repo
.buf
, 0777)) {
460 if ((errno
!= EEXIST
) || !counter
/* overflow */)
461 die_errno(_("could not create directory of '%s'"),
463 strbuf_setlen(&sb_repo
, len
);
464 strbuf_addf(&sb_repo
, "%d", counter
);
466 name
= strrchr(sb_repo
.buf
, '/') + 1;
470 sigchain_push_common(remove_junk_on_signal
);
472 junk_git_dir
= xstrdup(sb_repo
.buf
);
476 * lock the incomplete repo so prune won't delete it, unlock
477 * after the preparation is over.
479 strbuf_addf(&sb
, "%s/locked", sb_repo
.buf
);
480 if (opts
->keep_locked
)
481 write_file(sb
.buf
, "%s", opts
->keep_locked
);
483 write_file(sb
.buf
, _("initializing"));
485 strbuf_addf(&sb_git
, "%s/.git", path
);
486 if (safe_create_leading_directories_const(sb_git
.buf
))
487 die_errno(_("could not create leading directories of '%s'"),
489 junk_work_tree
= xstrdup(path
);
492 strbuf_addf(&sb
, "%s/gitdir", sb_repo
.buf
);
493 strbuf_realpath(&realpath
, sb_git
.buf
, 1);
494 write_file(sb
.buf
, "%s", realpath
.buf
);
495 strbuf_realpath(&realpath
, repo_get_common_dir(the_repository
), 1);
496 write_file(sb_git
.buf
, "gitdir: %s/worktrees/%s",
499 strbuf_addf(&sb
, "%s/commondir", sb_repo
.buf
);
500 write_file(sb
.buf
, "../..");
503 * Set up the ref store of the worktree and create the HEAD reference.
505 wt
= get_linked_worktree(name
, 1);
507 ret
= error(_("could not find created worktree '%s'"), name
);
510 wt_refs
= get_worktree_ref_store(wt
);
512 ret
= ref_store_create_on_disk(wt_refs
, REF_STORE_CREATE_ON_DISK_IS_WORKTREE
, &sb
);
516 if (!is_branch
&& commit
)
517 ret
= refs_update_ref(wt_refs
, NULL
, "HEAD", &commit
->object
.oid
,
518 NULL
, 0, UPDATE_REFS_MSG_ON_ERR
);
520 ret
= refs_update_symref(wt_refs
, "HEAD", symref
.buf
, NULL
);
525 * If the current worktree has sparse-checkout enabled, then copy
526 * the sparse-checkout patterns from the current worktree.
528 if (core_apply_sparse_checkout
)
529 copy_sparse_checkout(sb_repo
.buf
);
532 * If we are using worktree config, then copy all current config
533 * values from the current worktree into the new one, that way the
534 * new worktree behaves the same as this one.
536 if (the_repository
->repository_format_worktree_config
)
537 copy_filtered_worktree_config(sb_repo
.buf
);
539 strvec_pushf(&child_env
, "%s=%s", GIT_DIR_ENVIRONMENT
, sb_git
.buf
);
540 strvec_pushf(&child_env
, "%s=%s", GIT_WORK_TREE_ENVIRONMENT
, path
);
543 (ret
= make_worktree_orphan(refname
, opts
, &child_env
)))
546 if (opts
->checkout
&&
547 (ret
= checkout_worktree(opts
, &child_env
)))
551 FREE_AND_NULL(junk_work_tree
);
552 FREE_AND_NULL(junk_git_dir
);
555 if (ret
|| !opts
->keep_locked
) {
557 strbuf_addf(&sb
, "%s/locked", sb_repo
.buf
);
558 unlink_or_warn(sb
.buf
);
562 * Hook failure does not warrant worktree deletion, so run hook after
563 * is_junk is cleared, but do return appropriate code when hook fails.
565 if (!ret
&& opts
->checkout
&& !opts
->orphan
) {
566 struct run_hooks_opt opt
= RUN_HOOKS_OPT_INIT
;
568 strvec_pushl(&opt
.env
, "GIT_DIR", "GIT_WORK_TREE", NULL
);
569 strvec_pushl(&opt
.args
,
570 oid_to_hex(null_oid()),
571 oid_to_hex(&commit
->object
.oid
),
576 ret
= run_hooks_opt(the_repository
, "post-checkout", &opt
);
579 strvec_clear(&child_env
);
581 strbuf_release(&symref
);
582 strbuf_release(&sb_repo
);
583 strbuf_release(&sb_git
);
584 strbuf_release(&sb_name
);
585 strbuf_release(&realpath
);
590 static void print_preparing_worktree_line(int detach
,
592 const char *new_branch
,
593 int force_new_branch
)
595 if (force_new_branch
) {
596 struct commit
*commit
= lookup_commit_reference_by_name(new_branch
);
598 fprintf_ln(stderr
, _("Preparing worktree (new branch '%s')"), new_branch
);
600 fprintf_ln(stderr
, _("Preparing worktree (resetting branch '%s'; was at %s)"),
602 repo_find_unique_abbrev(the_repository
, &commit
->object
.oid
, DEFAULT_ABBREV
));
603 } else if (new_branch
) {
604 fprintf_ln(stderr
, _("Preparing worktree (new branch '%s')"), new_branch
);
606 struct strbuf s
= STRBUF_INIT
;
607 if (!detach
&& !strbuf_check_branch_ref(&s
, branch
) &&
608 refs_ref_exists(get_main_ref_store(the_repository
), s
.buf
))
609 fprintf_ln(stderr
, _("Preparing worktree (checking out '%s')"),
612 struct commit
*commit
= lookup_commit_reference_by_name(branch
);
614 BUG(_("unreachable: invalid reference: %s"), branch
);
615 fprintf_ln(stderr
, _("Preparing worktree (detached HEAD %s)"),
616 repo_find_unique_abbrev(the_repository
, &commit
->object
.oid
, DEFAULT_ABBREV
));
623 * Callback to short circuit iteration over refs on the first reference
624 * corresponding to a valid oid.
626 * Returns 0 on failure and non-zero on success.
628 static int first_valid_ref(const char *refname UNUSED
,
629 const char *referent UNUSED
,
630 const struct object_id
*oid UNUSED
,
632 void *cb_data UNUSED
)
638 * Verifies HEAD and determines whether there exist any valid local references.
640 * - Checks whether HEAD points to a valid reference.
642 * - Checks whether any valid local branches exist.
644 * - Emits a warning if there exist any valid branches but HEAD does not point
645 * to a valid reference.
647 * Returns 1 if any of the previous checks are true, otherwise returns 0.
649 static int can_use_local_refs(const struct add_opts
*opts
)
651 if (refs_head_ref(get_main_ref_store(the_repository
), first_valid_ref
, NULL
)) {
653 } else if (refs_for_each_branch_ref(get_main_ref_store(the_repository
), first_valid_ref
, NULL
)) {
655 struct strbuf path
= STRBUF_INIT
;
656 struct strbuf contents
= STRBUF_INIT
;
658 strbuf_add_real_path(&path
, get_worktree_git_dir(NULL
));
659 strbuf_addstr(&path
, "/HEAD");
660 strbuf_read_file(&contents
, path
.buf
, 64);
661 strbuf_stripspace(&contents
, NULL
);
662 strbuf_strip_suffix(&contents
, "\n");
664 warning(_("HEAD points to an invalid (or orphaned) reference.\n"
666 "HEAD contents: '%s'"),
667 path
.buf
, contents
.buf
);
668 strbuf_release(&path
);
669 strbuf_release(&contents
);
677 * Reports whether the necessary flags were set and whether the repository has
678 * remote references to attempt DWIM tracking of upstream branches.
680 * 1. Checks that `--guess-remote` was used or `worktree.guessRemote = true`.
682 * 2. Checks whether any valid remote branches exist.
684 * 3. Checks that there exists at least one remote and emits a warning/error
685 * if both checks 1. and 2. are false (can be bypassed with `--force`).
687 * Returns 1 if checks 1. and 2. are true, otherwise 0.
689 static int can_use_remote_refs(const struct add_opts
*opts
)
693 } else if (refs_for_each_remote_ref(get_main_ref_store(the_repository
), first_valid_ref
, NULL
)) {
695 } else if (!opts
->force
&& remote_get(NULL
)) {
696 die(_("No local or remote refs exist despite at least one remote\n"
697 "present, stopping; use 'add -f' to override or fetch a remote first"));
703 * Determines whether `--orphan` should be inferred in the evaluation of
704 * `worktree add path/` or `worktree add -b branch path/` and emits an error
705 * if the supplied arguments would produce an illegal combination when the
706 * `--orphan` flag is included.
708 * `opts` and `opt_track` contain the other options & flags supplied to the
711 * remote determines whether to check `can_use_remote_refs()` or not. This
712 * is primarily to differentiate between the basic `add` DWIM and `add -b`.
714 * Returns 1 when inferring `--orphan`, 0 otherwise, and emits an error when
715 * `--orphan` is inferred but doing so produces an illegal combination of
716 * options and flags. Additionally produces an error when remote refs are
717 * checked and the repo is in a state that looks like the user added a remote
718 * but forgot to fetch (and did not override the warning with -f).
720 static int dwim_orphan(const struct add_opts
*opts
, int opt_track
, int remote
)
722 if (can_use_local_refs(opts
)) {
724 } else if (remote
&& can_use_remote_refs(opts
)) {
726 } else if (!opts
->quiet
) {
727 fprintf_ln(stderr
, WORKTREE_ADD_DWIM_ORPHAN_INFER_TEXT
);
731 die(_("options '%s' and '%s' cannot be used together"),
732 "--orphan", "--track");
733 } else if (!opts
->checkout
) {
734 die(_("options '%s' and '%s' cannot be used together"),
735 "--orphan", "--no-checkout");
740 static char *dwim_branch(const char *path
, char **new_branch
)
744 const char *s
= worktree_basename(path
, &n
);
745 char *branchname
= xstrndup(s
, n
);
746 struct strbuf ref
= STRBUF_INIT
;
748 branch_exists
= !strbuf_check_branch_ref(&ref
, branchname
) &&
749 refs_ref_exists(get_main_ref_store(the_repository
),
751 strbuf_release(&ref
);
755 *new_branch
= branchname
;
757 struct object_id oid
;
758 char *remote
= unique_tracking_name(*new_branch
, &oid
, NULL
);
764 static int add(int ac
, const char **av
, const char *prefix
)
766 struct add_opts opts
;
767 const char *new_branch_force
= NULL
;
770 char *branch_to_free
= NULL
;
771 char *new_branch_to_free
= NULL
;
772 const char *new_branch
= NULL
;
773 char *opt_track
= NULL
;
774 const char *lock_reason
= NULL
;
776 int used_new_branch_options
;
777 struct option options
[] = {
778 OPT__FORCE(&opts
.force
,
779 N_("checkout <branch> even if already checked out in other worktree"),
780 PARSE_OPT_NOCOMPLETE
),
781 OPT_STRING('b', NULL
, &new_branch
, N_("branch"),
782 N_("create a new branch")),
783 OPT_STRING('B', NULL
, &new_branch_force
, N_("branch"),
784 N_("create or reset a branch")),
785 OPT_BOOL(0, "orphan", &opts
.orphan
, N_("create unborn branch")),
786 OPT_BOOL('d', "detach", &opts
.detach
, N_("detach HEAD at named commit")),
787 OPT_BOOL(0, "checkout", &opts
.checkout
, N_("populate the new working tree")),
788 OPT_BOOL(0, "lock", &keep_locked
, N_("keep the new working tree locked")),
789 OPT_STRING(0, "reason", &lock_reason
, N_("string"),
790 N_("reason for locking")),
791 OPT__QUIET(&opts
.quiet
, N_("suppress progress reporting")),
792 OPT_PASSTHRU(0, "track", &opt_track
, NULL
,
793 N_("set up tracking mode (see git-branch(1))"),
794 PARSE_OPT_NOARG
| PARSE_OPT_OPTARG
),
795 OPT_BOOL(0, "guess-remote", &guess_remote
,
796 N_("try to match the new branch name with a remote-tracking branch")),
801 memset(&opts
, 0, sizeof(opts
));
803 ac
= parse_options(ac
, av
, prefix
, options
, git_worktree_add_usage
, 0);
804 if (!!opts
.detach
+ !!new_branch
+ !!new_branch_force
> 1)
805 die(_("options '%s', '%s', and '%s' cannot be used together"), "-b", "-B", "--detach");
806 if (opts
.detach
&& opts
.orphan
)
807 die(_("options '%s' and '%s' cannot be used together"),
808 "--orphan", "--detach");
809 if (opts
.orphan
&& opt_track
)
810 die(_("options '%s' and '%s' cannot be used together"),
811 "--orphan", "--track");
812 if (opts
.orphan
&& !opts
.checkout
)
813 die(_("options '%s' and '%s' cannot be used together"),
814 "--orphan", "--no-checkout");
815 if (opts
.orphan
&& ac
== 2)
816 die(_("option '%s' and commit-ish cannot be used together"),
818 if (lock_reason
&& !keep_locked
)
819 die(_("the option '%s' requires '%s'"), "--reason", "--lock");
821 opts
.keep_locked
= lock_reason
;
822 else if (keep_locked
)
823 opts
.keep_locked
= _("added with --lock");
825 if (ac
< 1 || ac
> 2)
826 usage_with_options(git_worktree_add_usage
, options
);
828 path
= prefix_filename(prefix
, av
[0]);
829 branch
= ac
< 2 ? "HEAD" : av
[1];
830 used_new_branch_options
= new_branch
|| new_branch_force
;
832 if (!strcmp(branch
, "-"))
835 if (new_branch_force
) {
836 struct strbuf symref
= STRBUF_INIT
;
838 new_branch
= new_branch_force
;
841 !strbuf_check_branch_ref(&symref
, new_branch
) &&
842 refs_ref_exists(get_main_ref_store(the_repository
), symref
.buf
))
843 die_if_checked_out(symref
.buf
, 0);
844 strbuf_release(&symref
);
847 if (opts
.orphan
&& !new_branch
) {
849 const char *s
= worktree_basename(path
, &n
);
850 new_branch
= new_branch_to_free
= xstrndup(s
, n
);
851 } else if (opts
.orphan
) {
853 } else if (opts
.detach
) {
855 if (!strcmp(branch
, "HEAD"))
856 can_use_local_refs(&opts
);
857 } else if (ac
< 2 && new_branch
) {
858 /* DWIM: Infer --orphan when repo has no refs. */
859 opts
.orphan
= dwim_orphan(&opts
, !!opt_track
, 0);
861 /* DWIM: Guess branch name from path. */
862 char *s
= dwim_branch(path
, &new_branch_to_free
);
864 branch
= branch_to_free
= s
;
865 new_branch
= new_branch_to_free
;
867 /* DWIM: Infer --orphan when repo has no refs. */
868 opts
.orphan
= (!s
) && dwim_orphan(&opts
, !!opt_track
, 1);
869 } else if (ac
== 2) {
870 struct object_id oid
;
871 struct commit
*commit
;
874 commit
= lookup_commit_reference_by_name(branch
);
876 remote
= unique_tracking_name(branch
, &oid
, NULL
);
879 branch
= new_branch_to_free
= remote
;
883 if (!strcmp(branch
, "HEAD"))
884 can_use_local_refs(&opts
);
888 if (!opts
.orphan
&& !lookup_commit_reference_by_name(branch
)) {
889 int attempt_hint
= !opts
.quiet
&& (ac
< 2);
890 if (attempt_hint
&& used_new_branch_options
) {
891 advise_if_enabled(ADVICE_WORKTREE_ADD_ORPHAN
,
892 WORKTREE_ADD_ORPHAN_WITH_DASH_B_HINT_TEXT
,
894 } else if (attempt_hint
) {
895 advise_if_enabled(ADVICE_WORKTREE_ADD_ORPHAN
,
896 WORKTREE_ADD_ORPHAN_NO_DASH_B_HINT_TEXT
, path
);
898 die(_("invalid reference: %s"), branch
);
902 print_preparing_worktree_line(opts
.detach
, branch
, new_branch
, !!new_branch_force
);
906 } else if (new_branch
) {
907 struct child_process cp
= CHILD_PROCESS_INIT
;
909 strvec_push(&cp
.args
, "branch");
910 if (new_branch_force
)
911 strvec_push(&cp
.args
, "--force");
913 strvec_push(&cp
.args
, "--quiet");
914 strvec_push(&cp
.args
, new_branch
);
915 strvec_push(&cp
.args
, branch
);
917 strvec_push(&cp
.args
, opt_track
);
918 if (run_command(&cp
))
921 } else if (opt_track
) {
922 die(_("--[no-]track can only be used if a new branch is created"));
925 ret
= add_worktree(path
, branch
, &opts
);
928 free(branch_to_free
);
929 free(new_branch_to_free
);
933 static void show_worktree_porcelain(struct worktree
*wt
, int line_terminator
)
937 printf("worktree %s%c", wt
->path
, line_terminator
);
939 printf("bare%c", line_terminator
);
941 printf("HEAD %s%c", oid_to_hex(&wt
->head_oid
), line_terminator
);
943 printf("detached%c", line_terminator
);
944 else if (wt
->head_ref
)
945 printf("branch %s%c", wt
->head_ref
, line_terminator
);
948 reason
= worktree_lock_reason(wt
);
950 fputs("locked", stdout
);
953 write_name_quoted(reason
, stdout
, line_terminator
);
955 fputc(line_terminator
, stdout
);
959 reason
= worktree_prune_reason(wt
, expire
);
961 printf("prunable %s%c", reason
, line_terminator
);
963 fputc(line_terminator
, stdout
);
966 static void show_worktree(struct worktree
*wt
, int path_maxlen
, int abbrev_len
)
968 struct strbuf sb
= STRBUF_INIT
;
969 int cur_path_len
= strlen(wt
->path
);
970 int path_adj
= cur_path_len
- utf8_strwidth(wt
->path
);
973 strbuf_addf(&sb
, "%-*s ", 1 + path_maxlen
+ path_adj
, wt
->path
);
975 strbuf_addstr(&sb
, "(bare)");
977 strbuf_addf(&sb
, "%-*s ", abbrev_len
,
978 repo_find_unique_abbrev(the_repository
, &wt
->head_oid
, DEFAULT_ABBREV
));
980 strbuf_addstr(&sb
, "(detached HEAD)");
981 else if (wt
->head_ref
) {
982 char *ref
= refs_shorten_unambiguous_ref(get_main_ref_store(the_repository
),
985 strbuf_addf(&sb
, "[%s]", ref
);
988 strbuf_addstr(&sb
, "(error)");
991 reason
= worktree_lock_reason(wt
);
992 if (verbose
&& reason
&& *reason
)
993 strbuf_addf(&sb
, "\n\tlocked: %s", reason
);
995 strbuf_addstr(&sb
, " locked");
997 reason
= worktree_prune_reason(wt
, expire
);
998 if (verbose
&& reason
)
999 strbuf_addf(&sb
, "\n\tprunable: %s", reason
);
1001 strbuf_addstr(&sb
, " prunable");
1003 printf("%s\n", sb
.buf
);
1004 strbuf_release(&sb
);
1007 static void measure_widths(struct worktree
**wt
, int *abbrev
, int *maxlen
)
1011 for (i
= 0; wt
[i
]; i
++) {
1013 int path_len
= strlen(wt
[i
]->path
);
1015 if (path_len
> *maxlen
)
1017 sha1_len
= strlen(repo_find_unique_abbrev(the_repository
, &wt
[i
]->head_oid
, *abbrev
));
1018 if (sha1_len
> *abbrev
)
1023 static int pathcmp(const void *a_
, const void *b_
)
1025 const struct worktree
*const *a
= a_
;
1026 const struct worktree
*const *b
= b_
;
1027 return fspathcmp((*a
)->path
, (*b
)->path
);
1030 static void pathsort(struct worktree
**wt
)
1033 struct worktree
**p
= wt
;
1037 QSORT(wt
, n
, pathcmp
);
1040 static int list(int ac
, const char **av
, const char *prefix
)
1043 int line_terminator
= '\n';
1045 struct option options
[] = {
1046 OPT_BOOL(0, "porcelain", &porcelain
, N_("machine-readable output")),
1047 OPT__VERBOSE(&verbose
, N_("show extended annotations and reasons, if available")),
1048 OPT_EXPIRY_DATE(0, "expire", &expire
,
1049 N_("add 'prunable' annotation to worktrees older than <time>")),
1050 OPT_SET_INT('z', NULL
, &line_terminator
,
1051 N_("terminate records with a NUL character"), '\0'),
1056 ac
= parse_options(ac
, av
, prefix
, options
, git_worktree_list_usage
, 0);
1058 usage_with_options(git_worktree_list_usage
, options
);
1059 else if (verbose
&& porcelain
)
1060 die(_("options '%s' and '%s' cannot be used together"), "--verbose", "--porcelain");
1061 else if (!line_terminator
&& !porcelain
)
1062 die(_("the option '%s' requires '%s'"), "-z", "--porcelain");
1064 struct worktree
**worktrees
= get_worktrees();
1065 int path_maxlen
= 0, abbrev
= DEFAULT_ABBREV
, i
;
1067 /* sort worktrees by path but keep main worktree at top */
1068 pathsort(worktrees
+ 1);
1071 measure_widths(worktrees
, &abbrev
, &path_maxlen
);
1073 for (i
= 0; worktrees
[i
]; i
++) {
1075 show_worktree_porcelain(worktrees
[i
],
1078 show_worktree(worktrees
[i
], path_maxlen
, abbrev
);
1080 free_worktrees(worktrees
);
1085 static int lock_worktree(int ac
, const char **av
, const char *prefix
)
1087 const char *reason
= "", *old_reason
;
1088 struct option options
[] = {
1089 OPT_STRING(0, "reason", &reason
, N_("string"),
1090 N_("reason for locking")),
1093 struct worktree
**worktrees
, *wt
;
1095 ac
= parse_options(ac
, av
, prefix
, options
, git_worktree_lock_usage
, 0);
1097 usage_with_options(git_worktree_lock_usage
, options
);
1099 worktrees
= get_worktrees();
1100 wt
= find_worktree(worktrees
, prefix
, av
[0]);
1102 die(_("'%s' is not a working tree"), av
[0]);
1103 if (is_main_worktree(wt
))
1104 die(_("The main working tree cannot be locked or unlocked"));
1106 old_reason
= worktree_lock_reason(wt
);
1109 die(_("'%s' is already locked, reason: %s"),
1111 die(_("'%s' is already locked"), av
[0]);
1114 write_file(git_common_path("worktrees/%s/locked", wt
->id
),
1116 free_worktrees(worktrees
);
1120 static int unlock_worktree(int ac
, const char **av
, const char *prefix
)
1122 struct option options
[] = {
1125 struct worktree
**worktrees
, *wt
;
1128 ac
= parse_options(ac
, av
, prefix
, options
, git_worktree_unlock_usage
, 0);
1130 usage_with_options(git_worktree_unlock_usage
, options
);
1132 worktrees
= get_worktrees();
1133 wt
= find_worktree(worktrees
, prefix
, av
[0]);
1135 die(_("'%s' is not a working tree"), av
[0]);
1136 if (is_main_worktree(wt
))
1137 die(_("The main working tree cannot be locked or unlocked"));
1138 if (!worktree_lock_reason(wt
))
1139 die(_("'%s' is not locked"), av
[0]);
1140 ret
= unlink_or_warn(git_common_path("worktrees/%s/locked", wt
->id
));
1141 free_worktrees(worktrees
);
1145 static void validate_no_submodules(const struct worktree
*wt
)
1147 struct index_state istate
= INDEX_STATE_INIT(the_repository
);
1148 struct strbuf path
= STRBUF_INIT
;
1149 int i
, found_submodules
= 0;
1151 if (is_directory(worktree_git_path(the_repository
, wt
, "modules"))) {
1153 * There could be false positives, e.g. the "modules"
1154 * directory exists but is empty. But it's a rare case and
1155 * this simpler check is probably good enough for now.
1157 found_submodules
= 1;
1158 } else if (read_index_from(&istate
, worktree_git_path(the_repository
, wt
, "index"),
1159 get_worktree_git_dir(wt
)) > 0) {
1160 for (i
= 0; i
< istate
.cache_nr
; i
++) {
1161 struct cache_entry
*ce
= istate
.cache
[i
];
1164 if (!S_ISGITLINK(ce
->ce_mode
))
1167 strbuf_reset(&path
);
1168 strbuf_addf(&path
, "%s/%s", wt
->path
, ce
->name
);
1169 if (!is_submodule_populated_gently(path
.buf
, &err
))
1172 found_submodules
= 1;
1176 discard_index(&istate
);
1177 strbuf_release(&path
);
1179 if (found_submodules
)
1180 die(_("working trees containing submodules cannot be moved or removed"));
1183 static int move_worktree(int ac
, const char **av
, const char *prefix
)
1186 struct option options
[] = {
1188 N_("force move even if worktree is dirty or locked"),
1189 PARSE_OPT_NOCOMPLETE
),
1192 struct worktree
**worktrees
, *wt
;
1193 struct strbuf dst
= STRBUF_INIT
;
1194 struct strbuf errmsg
= STRBUF_INIT
;
1195 const char *reason
= NULL
;
1198 ac
= parse_options(ac
, av
, prefix
, options
, git_worktree_move_usage
,
1201 usage_with_options(git_worktree_move_usage
, options
);
1203 path
= prefix_filename(prefix
, av
[1]);
1204 strbuf_addstr(&dst
, path
);
1207 worktrees
= get_worktrees();
1208 wt
= find_worktree(worktrees
, prefix
, av
[0]);
1210 die(_("'%s' is not a working tree"), av
[0]);
1211 if (is_main_worktree(wt
))
1212 die(_("'%s' is a main working tree"), av
[0]);
1213 if (is_directory(dst
.buf
)) {
1214 const char *sep
= find_last_dir_sep(wt
->path
);
1217 die(_("could not figure out destination name from '%s'"),
1219 strbuf_trim_trailing_dir_sep(&dst
);
1220 strbuf_addstr(&dst
, sep
);
1222 check_candidate_path(dst
.buf
, force
, worktrees
, "move");
1224 validate_no_submodules(wt
);
1227 reason
= worktree_lock_reason(wt
);
1230 die(_("cannot move a locked working tree, lock reason: %s\nuse 'move -f -f' to override or unlock first"),
1232 die(_("cannot move a locked working tree;\nuse 'move -f -f' to override or unlock first"));
1234 if (validate_worktree(wt
, &errmsg
, 0))
1235 die(_("validation failed, cannot move working tree: %s"),
1237 strbuf_release(&errmsg
);
1239 if (rename(wt
->path
, dst
.buf
) == -1)
1240 die_errno(_("failed to move '%s' to '%s'"), wt
->path
, dst
.buf
);
1242 update_worktree_location(wt
, dst
.buf
);
1244 strbuf_release(&dst
);
1245 free_worktrees(worktrees
);
1250 * Note, "git status --porcelain" is used to determine if it's safe to
1251 * delete a whole worktree. "git status" does not ignore user
1252 * configuration, so if a normal "git status" shows "clean" for the
1253 * user, then it's ok to remove it.
1255 * This assumption may be a bad one. We may want to ignore
1256 * (potentially bad) user settings and only delete a worktree when
1257 * it's absolutely safe to do so from _our_ point of view because we
1260 static void check_clean_worktree(struct worktree
*wt
,
1261 const char *original_path
)
1263 struct child_process cp
;
1268 * Until we sort this out, all submodules are "dirty" and
1269 * will abort this function.
1271 validate_no_submodules(wt
);
1273 child_process_init(&cp
);
1274 strvec_pushf(&cp
.env
, "%s=%s/.git",
1275 GIT_DIR_ENVIRONMENT
, wt
->path
);
1276 strvec_pushf(&cp
.env
, "%s=%s",
1277 GIT_WORK_TREE_ENVIRONMENT
, wt
->path
);
1278 strvec_pushl(&cp
.args
, "status",
1279 "--porcelain", "--ignore-submodules=none",
1284 ret
= start_command(&cp
);
1286 die_errno(_("failed to run 'git status' on '%s'"),
1288 ret
= xread(cp
.out
, buf
, sizeof(buf
));
1290 die(_("'%s' contains modified or untracked files, use --force to delete it"),
1293 ret
= finish_command(&cp
);
1295 die_errno(_("failed to run 'git status' on '%s', code %d"),
1296 original_path
, ret
);
1299 static int delete_git_work_tree(struct worktree
*wt
)
1301 struct strbuf sb
= STRBUF_INIT
;
1304 strbuf_addstr(&sb
, wt
->path
);
1305 if (remove_dir_recursively(&sb
, 0)) {
1306 error_errno(_("failed to delete '%s'"), sb
.buf
);
1309 strbuf_release(&sb
);
1313 static int remove_worktree(int ac
, const char **av
, const char *prefix
)
1316 struct option options
[] = {
1318 N_("force removal even if worktree is dirty or locked"),
1319 PARSE_OPT_NOCOMPLETE
),
1322 struct worktree
**worktrees
, *wt
;
1323 struct strbuf errmsg
= STRBUF_INIT
;
1324 const char *reason
= NULL
;
1327 ac
= parse_options(ac
, av
, prefix
, options
, git_worktree_remove_usage
, 0);
1329 usage_with_options(git_worktree_remove_usage
, options
);
1331 worktrees
= get_worktrees();
1332 wt
= find_worktree(worktrees
, prefix
, av
[0]);
1334 die(_("'%s' is not a working tree"), av
[0]);
1335 if (is_main_worktree(wt
))
1336 die(_("'%s' is a main working tree"), av
[0]);
1338 reason
= worktree_lock_reason(wt
);
1341 die(_("cannot remove a locked working tree, lock reason: %s\nuse 'remove -f -f' to override or unlock first"),
1343 die(_("cannot remove a locked working tree;\nuse 'remove -f -f' to override or unlock first"));
1345 if (validate_worktree(wt
, &errmsg
, WT_VALIDATE_WORKTREE_MISSING_OK
))
1346 die(_("validation failed, cannot remove working tree: %s"),
1348 strbuf_release(&errmsg
);
1350 if (file_exists(wt
->path
)) {
1352 check_clean_worktree(wt
, av
[0]);
1354 ret
|= delete_git_work_tree(wt
);
1357 * continue on even if ret is non-zero, there's no going back
1360 ret
|= delete_git_dir(wt
->id
);
1361 delete_worktrees_dir_if_empty();
1363 free_worktrees(worktrees
);
1367 static void report_repair(int iserr
, const char *path
, const char *msg
, void *cb_data
)
1370 fprintf_ln(stderr
, _("repair: %s: %s"), msg
, path
);
1372 int *exit_status
= (int *)cb_data
;
1373 fprintf_ln(stderr
, _("error: %s: %s"), msg
, path
);
1378 static int repair(int ac
, const char **av
, const char *prefix
)
1381 const char *self
[] = { ".", NULL
};
1382 struct option options
[] = {
1387 ac
= parse_options(ac
, av
, prefix
, options
, git_worktree_repair_usage
, 0);
1388 p
= ac
> 0 ? av
: self
;
1390 repair_worktree_at_path(*p
, report_repair
, &rc
);
1391 repair_worktrees(report_repair
, &rc
);
1395 int cmd_worktree(int ac
,
1398 struct repository
*repo UNUSED
)
1400 parse_opt_subcommand_fn
*fn
= NULL
;
1401 struct option options
[] = {
1402 OPT_SUBCOMMAND("add", &fn
, add
),
1403 OPT_SUBCOMMAND("prune", &fn
, prune
),
1404 OPT_SUBCOMMAND("list", &fn
, list
),
1405 OPT_SUBCOMMAND("lock", &fn
, lock_worktree
),
1406 OPT_SUBCOMMAND("unlock", &fn
, unlock_worktree
),
1407 OPT_SUBCOMMAND("move", &fn
, move_worktree
),
1408 OPT_SUBCOMMAND("remove", &fn
, remove_worktree
),
1409 OPT_SUBCOMMAND("repair", &fn
, repair
),
1413 git_config(git_worktree_config
, NULL
);
1418 ac
= parse_options(ac
, av
, prefix
, options
, git_worktree_usage
, 0);
1420 prepare_repo_settings(the_repository
);
1421 the_repository
->settings
.command_requires_full_index
= 0;
1423 return fn(ac
, av
, prefix
);