6 #include "parse-options.h"
7 #include "argv-array.h"
10 #include "run-command.h"
16 static const char * const worktree_usage
[] = {
17 N_("git worktree add [<options>] <path> [<branch>]"),
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>"),
32 const char *new_branch
;
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 prune_worktree(const char *id
, struct strbuf
*reason
)
59 if (!is_directory(git_path("worktrees/%s", id
))) {
60 strbuf_addf(reason
, _("Removing worktrees/%s: not a valid directory"), id
);
63 if (file_exists(git_path("worktrees/%s/locked", id
)))
65 if (stat(git_path("worktrees/%s/gitdir", id
), &st
)) {
66 strbuf_addf(reason
, _("Removing worktrees/%s: gitdir file does not exist"), id
);
69 fd
= open(git_path("worktrees/%s/gitdir", id
), O_RDONLY
);
71 strbuf_addf(reason
, _("Removing worktrees/%s: unable to read gitdir file (%s)"),
75 len
= xsize_t(st
.st_size
);
78 read_result
= read_in_full(fd
, path
, len
);
79 if (read_result
< 0) {
80 strbuf_addf(reason
, _("Removing worktrees/%s: unable to read gitdir file (%s)"),
88 if (read_result
!= len
) {
90 _("Removing worktrees/%s: short read (expected %"PRIuMAX
" bytes, read %"PRIuMAX
")"),
91 id
, (uintmax_t)len
, (uintmax_t)read_result
);
95 while (len
&& (path
[len
- 1] == '\n' || path
[len
- 1] == '\r'))
98 strbuf_addf(reason
, _("Removing worktrees/%s: invalid gitdir file"), id
);
103 if (!file_exists(path
)) {
107 * the repo is moved manually and has not been
110 if (!stat(git_path("worktrees/%s/link", id
), &st_link
) &&
111 st_link
.st_nlink
> 1)
113 if (st
.st_mtime
<= expire
) {
114 strbuf_addf(reason
, _("Removing worktrees/%s: gitdir file points to non-existent location"), id
);
124 static void prune_worktrees(void)
126 struct strbuf reason
= STRBUF_INIT
;
127 struct strbuf path
= STRBUF_INIT
;
128 DIR *dir
= opendir(git_path("worktrees"));
133 while ((d
= readdir(dir
)) != NULL
) {
134 if (is_dot_or_dotdot(d
->d_name
))
136 strbuf_reset(&reason
);
137 if (!prune_worktree(d
->d_name
, &reason
))
139 if (show_only
|| verbose
)
140 printf("%s\n", reason
.buf
);
143 git_path_buf(&path
, "worktrees/%s", d
->d_name
);
144 ret
= remove_dir_recursively(&path
, 0);
145 if (ret
< 0 && errno
== ENOTDIR
)
146 ret
= unlink(path
.buf
);
148 error_errno(_("failed to remove '%s'"), path
.buf
);
152 rmdir(git_path("worktrees"));
153 strbuf_release(&reason
);
154 strbuf_release(&path
);
157 static int prune(int ac
, const char **av
, const char *prefix
)
159 struct option options
[] = {
160 OPT__DRY_RUN(&show_only
, N_("do not remove, show only")),
161 OPT__VERBOSE(&verbose
, N_("report pruned working trees")),
162 OPT_EXPIRY_DATE(0, "expire", &expire
,
163 N_("expire working trees older than <time>")),
168 ac
= parse_options(ac
, av
, prefix
, options
, worktree_usage
, 0);
170 usage_with_options(worktree_usage
, options
);
175 static char *junk_work_tree
;
176 static char *junk_git_dir
;
178 static pid_t junk_pid
;
180 static void remove_junk(void)
182 struct strbuf sb
= STRBUF_INIT
;
183 if (!is_junk
|| getpid() != junk_pid
)
186 strbuf_addstr(&sb
, junk_git_dir
);
187 remove_dir_recursively(&sb
, 0);
190 if (junk_work_tree
) {
191 strbuf_addstr(&sb
, junk_work_tree
);
192 remove_dir_recursively(&sb
, 0);
197 static void remove_junk_on_signal(int signo
)
204 static const char *worktree_basename(const char *path
, int *olen
)
210 while (len
&& is_dir_sep(path
[len
- 1]))
213 for (name
= path
+ len
- 1; name
> path
; name
--)
214 if (is_dir_sep(*name
)) {
223 static int add_worktree(const char *path
, const char *refname
,
224 const struct add_opts
*opts
)
226 struct strbuf sb_git
= STRBUF_INIT
, sb_repo
= STRBUF_INIT
;
227 struct strbuf sb
= STRBUF_INIT
;
230 struct child_process cp
= CHILD_PROCESS_INIT
;
231 struct argv_array child_env
= ARGV_ARRAY_INIT
;
232 int counter
= 0, len
, ret
;
233 struct strbuf symref
= STRBUF_INIT
;
234 struct commit
*commit
= NULL
;
237 if (file_exists(path
) && !is_empty_dir(path
))
238 die(_("'%s' already exists"), path
);
240 /* is 'refname' a branch or commit? */
241 if (!opts
->detach
&& !strbuf_check_branch_ref(&symref
, refname
) &&
242 ref_exists(symref
.buf
)) {
245 die_if_checked_out(symref
.buf
, 0);
247 commit
= lookup_commit_reference_by_name(refname
);
249 die(_("invalid reference: %s"), refname
);
251 name
= worktree_basename(path
, &len
);
252 git_path_buf(&sb_repo
, "worktrees/%.*s", (int)(path
+ len
- name
), name
);
254 if (safe_create_leading_directories_const(sb_repo
.buf
))
255 die_errno(_("could not create leading directories of '%s'"),
257 while (!stat(sb_repo
.buf
, &st
)) {
259 strbuf_setlen(&sb_repo
, len
);
260 strbuf_addf(&sb_repo
, "%d", counter
);
262 name
= strrchr(sb_repo
.buf
, '/') + 1;
266 sigchain_push_common(remove_junk_on_signal
);
268 if (mkdir(sb_repo
.buf
, 0777))
269 die_errno(_("could not create directory of '%s'"), sb_repo
.buf
);
270 junk_git_dir
= xstrdup(sb_repo
.buf
);
274 * lock the incomplete repo so prune won't delete it, unlock
275 * after the preparation is over.
277 strbuf_addf(&sb
, "%s/locked", sb_repo
.buf
);
278 if (!opts
->keep_locked
)
279 write_file(sb
.buf
, "initializing");
281 write_file(sb
.buf
, "added with --lock");
283 strbuf_addf(&sb_git
, "%s/.git", path
);
284 if (safe_create_leading_directories_const(sb_git
.buf
))
285 die_errno(_("could not create leading directories of '%s'"),
287 junk_work_tree
= xstrdup(path
);
290 strbuf_addf(&sb
, "%s/gitdir", sb_repo
.buf
);
291 write_file(sb
.buf
, "%s", real_path(sb_git
.buf
));
292 write_file(sb_git
.buf
, "gitdir: %s/worktrees/%s",
293 real_path(get_git_common_dir()), name
);
295 * This is to keep resolve_ref() happy. We need a valid HEAD
296 * or is_git_directory() will reject the directory. Any value which
297 * looks like an object ID will do since it will be immediately
298 * replaced by the symbolic-ref or update-ref invocation in the new
302 strbuf_addf(&sb
, "%s/HEAD", sb_repo
.buf
);
303 write_file(sb
.buf
, "%s", sha1_to_hex(null_sha1
));
305 strbuf_addf(&sb
, "%s/commondir", sb_repo
.buf
);
306 write_file(sb
.buf
, "../..");
308 fprintf_ln(stderr
, _("Preparing %s (identifier %s)"), path
, name
);
310 argv_array_pushf(&child_env
, "%s=%s", GIT_DIR_ENVIRONMENT
, sb_git
.buf
);
311 argv_array_pushf(&child_env
, "%s=%s", GIT_WORK_TREE_ENVIRONMENT
, path
);
315 argv_array_pushl(&cp
.args
, "update-ref", "HEAD",
316 oid_to_hex(&commit
->object
.oid
), NULL
);
318 argv_array_pushl(&cp
.args
, "symbolic-ref", "HEAD",
320 cp
.env
= child_env
.argv
;
321 ret
= run_command(&cp
);
325 if (opts
->checkout
) {
327 argv_array_clear(&cp
.args
);
328 argv_array_pushl(&cp
.args
, "reset", "--hard", NULL
);
329 cp
.env
= child_env
.argv
;
330 ret
= run_command(&cp
);
336 FREE_AND_NULL(junk_work_tree
);
337 FREE_AND_NULL(junk_git_dir
);
340 if (ret
|| !opts
->keep_locked
) {
342 strbuf_addf(&sb
, "%s/locked", sb_repo
.buf
);
343 unlink_or_warn(sb
.buf
);
347 * Hook failure does not warrant worktree deletion, so run hook after
348 * is_junk is cleared, but do return appropriate code when hook fails.
350 if (!ret
&& opts
->checkout
)
351 ret
= run_hook_le(NULL
, "post-checkout", oid_to_hex(&null_oid
),
352 oid_to_hex(&commit
->object
.oid
), "1", NULL
);
354 argv_array_clear(&child_env
);
356 strbuf_release(&symref
);
357 strbuf_release(&sb_repo
);
358 strbuf_release(&sb_git
);
362 static int add(int ac
, const char **av
, const char *prefix
)
364 struct add_opts opts
;
365 const char *new_branch_force
= NULL
;
368 const char *opt_track
= NULL
;
369 struct option options
[] = {
370 OPT__FORCE(&opts
.force
, N_("checkout <branch> even if already checked out in other worktree")),
371 OPT_STRING('b', NULL
, &opts
.new_branch
, N_("branch"),
372 N_("create a new branch")),
373 OPT_STRING('B', NULL
, &new_branch_force
, N_("branch"),
374 N_("create or reset a branch")),
375 OPT_BOOL(0, "detach", &opts
.detach
, N_("detach HEAD at named commit")),
376 OPT_BOOL(0, "checkout", &opts
.checkout
, N_("populate the new working tree")),
377 OPT_BOOL(0, "lock", &opts
.keep_locked
, N_("keep the new working tree locked")),
378 OPT_PASSTHRU(0, "track", &opt_track
, NULL
,
379 N_("set up tracking mode (see git-branch(1))"),
380 PARSE_OPT_NOARG
| PARSE_OPT_OPTARG
),
381 OPT_BOOL(0, "guess-remote", &guess_remote
,
382 N_("try to match the new branch name with a remote-tracking branch")),
386 memset(&opts
, 0, sizeof(opts
));
388 ac
= parse_options(ac
, av
, prefix
, options
, worktree_usage
, 0);
389 if (!!opts
.detach
+ !!opts
.new_branch
+ !!new_branch_force
> 1)
390 die(_("-b, -B, and --detach are mutually exclusive"));
391 if (ac
< 1 || ac
> 2)
392 usage_with_options(worktree_usage
, options
);
394 path
= prefix_filename(prefix
, av
[0]);
395 branch
= ac
< 2 ? "HEAD" : av
[1];
397 if (!strcmp(branch
, "-"))
400 opts
.force_new_branch
= !!new_branch_force
;
401 if (opts
.force_new_branch
) {
402 struct strbuf symref
= STRBUF_INIT
;
404 opts
.new_branch
= new_branch_force
;
407 !strbuf_check_branch_ref(&symref
, opts
.new_branch
) &&
408 ref_exists(symref
.buf
))
409 die_if_checked_out(symref
.buf
, 0);
410 strbuf_release(&symref
);
413 if (ac
< 2 && !opts
.new_branch
&& !opts
.detach
) {
415 const char *s
= worktree_basename(path
, &n
);
416 opts
.new_branch
= xstrndup(s
, n
);
418 struct object_id oid
;
420 unique_tracking_name(opts
.new_branch
, &oid
);
426 if (ac
== 2 && !opts
.new_branch
&& !opts
.detach
) {
427 struct object_id oid
;
428 struct commit
*commit
;
431 commit
= lookup_commit_reference_by_name(branch
);
433 remote
= unique_tracking_name(branch
, &oid
);
435 opts
.new_branch
= branch
;
441 if (opts
.new_branch
) {
442 struct child_process cp
= CHILD_PROCESS_INIT
;
444 argv_array_push(&cp
.args
, "branch");
445 if (opts
.force_new_branch
)
446 argv_array_push(&cp
.args
, "--force");
447 argv_array_push(&cp
.args
, opts
.new_branch
);
448 argv_array_push(&cp
.args
, branch
);
450 argv_array_push(&cp
.args
, opt_track
);
451 if (run_command(&cp
))
453 branch
= opts
.new_branch
;
454 } else if (opt_track
) {
455 die(_("--[no-]track can only be used if a new branch is created"));
460 return add_worktree(path
, branch
, &opts
);
463 static void show_worktree_porcelain(struct worktree
*wt
)
465 printf("worktree %s\n", wt
->path
);
469 printf("HEAD %s\n", oid_to_hex(&wt
->head_oid
));
471 printf("detached\n");
472 else if (wt
->head_ref
)
473 printf("branch %s\n", wt
->head_ref
);
478 static void show_worktree(struct worktree
*wt
, int path_maxlen
, int abbrev_len
)
480 struct strbuf sb
= STRBUF_INIT
;
481 int cur_path_len
= strlen(wt
->path
);
482 int path_adj
= cur_path_len
- utf8_strwidth(wt
->path
);
484 strbuf_addf(&sb
, "%-*s ", 1 + path_maxlen
+ path_adj
, wt
->path
);
486 strbuf_addstr(&sb
, "(bare)");
488 strbuf_addf(&sb
, "%-*s ", abbrev_len
,
489 find_unique_abbrev(wt
->head_oid
.hash
, DEFAULT_ABBREV
));
491 strbuf_addstr(&sb
, "(detached HEAD)");
492 else if (wt
->head_ref
) {
493 char *ref
= shorten_unambiguous_ref(wt
->head_ref
, 0);
494 strbuf_addf(&sb
, "[%s]", ref
);
497 strbuf_addstr(&sb
, "(error)");
499 printf("%s\n", sb
.buf
);
504 static void measure_widths(struct worktree
**wt
, int *abbrev
, int *maxlen
)
508 for (i
= 0; wt
[i
]; i
++) {
510 int path_len
= strlen(wt
[i
]->path
);
512 if (path_len
> *maxlen
)
514 sha1_len
= strlen(find_unique_abbrev(wt
[i
]->head_oid
.hash
, *abbrev
));
515 if (sha1_len
> *abbrev
)
520 static int list(int ac
, const char **av
, const char *prefix
)
524 struct option options
[] = {
525 OPT_BOOL(0, "porcelain", &porcelain
, N_("machine-readable output")),
529 ac
= parse_options(ac
, av
, prefix
, options
, worktree_usage
, 0);
531 usage_with_options(worktree_usage
, options
);
533 struct worktree
**worktrees
= get_worktrees(GWT_SORT_LINKED
);
534 int path_maxlen
= 0, abbrev
= DEFAULT_ABBREV
, i
;
537 measure_widths(worktrees
, &abbrev
, &path_maxlen
);
539 for (i
= 0; worktrees
[i
]; i
++) {
541 show_worktree_porcelain(worktrees
[i
]);
543 show_worktree(worktrees
[i
], path_maxlen
, abbrev
);
545 free_worktrees(worktrees
);
550 static int lock_worktree(int ac
, const char **av
, const char *prefix
)
552 const char *reason
= "", *old_reason
;
553 struct option options
[] = {
554 OPT_STRING(0, "reason", &reason
, N_("string"),
555 N_("reason for locking")),
558 struct worktree
**worktrees
, *wt
;
560 ac
= parse_options(ac
, av
, prefix
, options
, worktree_usage
, 0);
562 usage_with_options(worktree_usage
, options
);
564 worktrees
= get_worktrees(0);
565 wt
= find_worktree(worktrees
, prefix
, av
[0]);
567 die(_("'%s' is not a working tree"), av
[0]);
568 if (is_main_worktree(wt
))
569 die(_("The main working tree cannot be locked or unlocked"));
571 old_reason
= is_worktree_locked(wt
);
574 die(_("'%s' is already locked, reason: %s"),
576 die(_("'%s' is already locked"), av
[0]);
579 write_file(git_common_path("worktrees/%s/locked", wt
->id
),
581 free_worktrees(worktrees
);
585 static int unlock_worktree(int ac
, const char **av
, const char *prefix
)
587 struct option options
[] = {
590 struct worktree
**worktrees
, *wt
;
593 ac
= parse_options(ac
, av
, prefix
, options
, worktree_usage
, 0);
595 usage_with_options(worktree_usage
, options
);
597 worktrees
= get_worktrees(0);
598 wt
= find_worktree(worktrees
, prefix
, av
[0]);
600 die(_("'%s' is not a working tree"), av
[0]);
601 if (is_main_worktree(wt
))
602 die(_("The main working tree cannot be locked or unlocked"));
603 if (!is_worktree_locked(wt
))
604 die(_("'%s' is not locked"), av
[0]);
605 ret
= unlink_or_warn(git_common_path("worktrees/%s/locked", wt
->id
));
606 free_worktrees(worktrees
);
610 static void validate_no_submodules(const struct worktree
*wt
)
612 struct index_state istate
= { NULL
};
613 int i
, found_submodules
= 0;
615 if (read_index_from(&istate
, worktree_git_path(wt
, "index")) > 0) {
616 for (i
= 0; i
< istate
.cache_nr
; i
++) {
617 struct cache_entry
*ce
= istate
.cache
[i
];
619 if (S_ISGITLINK(ce
->ce_mode
)) {
620 found_submodules
= 1;
625 discard_index(&istate
);
627 if (found_submodules
)
628 die(_("working trees containing submodules cannot be moved or removed"));
631 static int move_worktree(int ac
, const char **av
, const char *prefix
)
633 struct option options
[] = {
636 struct worktree
**worktrees
, *wt
;
637 struct strbuf dst
= STRBUF_INIT
;
638 struct strbuf errmsg
= STRBUF_INIT
;
642 ac
= parse_options(ac
, av
, prefix
, options
, worktree_usage
, 0);
644 usage_with_options(worktree_usage
, options
);
646 path
= prefix_filename(prefix
, av
[1]);
647 strbuf_addstr(&dst
, path
);
650 worktrees
= get_worktrees(0);
651 wt
= find_worktree(worktrees
, prefix
, av
[0]);
653 die(_("'%s' is not a working tree"), av
[0]);
654 if (is_main_worktree(wt
))
655 die(_("'%s' is a main working tree"), av
[0]);
656 if (is_directory(dst
.buf
)) {
657 const char *sep
= find_last_dir_sep(wt
->path
);
660 die(_("could not figure out destination name from '%s'"),
662 strbuf_trim_trailing_dir_sep(&dst
);
663 strbuf_addstr(&dst
, sep
);
665 if (file_exists(dst
.buf
))
666 die(_("target '%s' already exists"), dst
.buf
);
668 validate_no_submodules(wt
);
670 reason
= is_worktree_locked(wt
);
673 die(_("cannot move a locked working tree, lock reason: %s"),
675 die(_("cannot move a locked working tree"));
677 if (validate_worktree(wt
, &errmsg
, 0))
678 die(_("validation failed, cannot move working tree: %s"),
680 strbuf_release(&errmsg
);
682 if (rename(wt
->path
, dst
.buf
) == -1)
683 die_errno(_("failed to move '%s' to '%s'"), wt
->path
, dst
.buf
);
685 update_worktree_location(wt
, dst
.buf
);
687 strbuf_release(&dst
);
688 free_worktrees(worktrees
);
693 * Note, "git status --porcelain" is used to determine if it's safe to
694 * delete a whole worktree. "git status" does not ignore user
695 * configuration, so if a normal "git status" shows "clean" for the
696 * user, then it's ok to remove it.
698 * This assumption may be a bad one. We may want to ignore
699 * (potentially bad) user settings and only delete a worktree when
700 * it's absolutely safe to do so from _our_ point of view because we
703 static void check_clean_worktree(struct worktree
*wt
,
704 const char *original_path
)
706 struct argv_array child_env
= ARGV_ARRAY_INIT
;
707 struct child_process cp
;
712 * Until we sort this out, all submodules are "dirty" and
713 * will abort this function.
715 validate_no_submodules(wt
);
717 argv_array_pushf(&child_env
, "%s=%s/.git",
718 GIT_DIR_ENVIRONMENT
, wt
->path
);
719 argv_array_pushf(&child_env
, "%s=%s",
720 GIT_WORK_TREE_ENVIRONMENT
, wt
->path
);
721 memset(&cp
, 0, sizeof(cp
));
722 argv_array_pushl(&cp
.args
, "status",
723 "--porcelain", "--ignore-submodules=none",
725 cp
.env
= child_env
.argv
;
729 ret
= start_command(&cp
);
731 die_errno(_("failed to run 'git status' on '%s'"),
733 ret
= xread(cp
.out
, buf
, sizeof(buf
));
735 die(_("'%s' is dirty, use --force to delete it"),
738 ret
= finish_command(&cp
);
740 die_errno(_("failed to run 'git status' on '%s', code %d"),
744 static int delete_git_work_tree(struct worktree
*wt
)
746 struct strbuf sb
= STRBUF_INIT
;
749 strbuf_addstr(&sb
, wt
->path
);
750 if (remove_dir_recursively(&sb
, 0)) {
751 error_errno(_("failed to delete '%s'"), sb
.buf
);
758 static int delete_git_dir(struct worktree
*wt
)
760 struct strbuf sb
= STRBUF_INIT
;
763 strbuf_addstr(&sb
, git_common_path("worktrees/%s", wt
->id
));
764 if (remove_dir_recursively(&sb
, 0)) {
765 error_errno(_("failed to delete '%s'"), sb
.buf
);
772 static int remove_worktree(int ac
, const char **av
, const char *prefix
)
775 struct option options
[] = {
776 OPT_BOOL(0, "force", &force
,
777 N_("force removing even if the worktree is dirty")),
780 struct worktree
**worktrees
, *wt
;
781 struct strbuf errmsg
= STRBUF_INIT
;
785 ac
= parse_options(ac
, av
, prefix
, options
, worktree_usage
, 0);
787 usage_with_options(worktree_usage
, options
);
789 worktrees
= get_worktrees(0);
790 wt
= find_worktree(worktrees
, prefix
, av
[0]);
792 die(_("'%s' is not a working tree"), av
[0]);
793 if (is_main_worktree(wt
))
794 die(_("'%s' is a main working tree"), av
[0]);
795 reason
= is_worktree_locked(wt
);
798 die(_("cannot remove a locked working tree, lock reason: %s"),
800 die(_("cannot remove a locked working tree"));
802 if (validate_worktree(wt
, &errmsg
, WT_VALIDATE_WORKTREE_MISSING_OK
))
803 die(_("validation failed, cannot remove working tree: %s"),
805 strbuf_release(&errmsg
);
807 if (file_exists(wt
->path
)) {
809 check_clean_worktree(wt
, av
[0]);
811 ret
|= delete_git_work_tree(wt
);
814 * continue on even if ret is non-zero, there's no going back
817 ret
|= delete_git_dir(wt
);
819 free_worktrees(worktrees
);
823 int cmd_worktree(int ac
, const char **av
, const char *prefix
)
825 struct option options
[] = {
829 git_config(git_worktree_config
, NULL
);
832 usage_with_options(worktree_usage
, options
);
835 if (!strcmp(av
[1], "add"))
836 return add(ac
- 1, av
+ 1, prefix
);
837 if (!strcmp(av
[1], "prune"))
838 return prune(ac
- 1, av
+ 1, prefix
);
839 if (!strcmp(av
[1], "list"))
840 return list(ac
- 1, av
+ 1, prefix
);
841 if (!strcmp(av
[1], "lock"))
842 return lock_worktree(ac
- 1, av
+ 1, prefix
);
843 if (!strcmp(av
[1], "unlock"))
844 return unlock_worktree(ac
- 1, av
+ 1, prefix
);
845 if (!strcmp(av
[1], "move"))
846 return move_worktree(ac
- 1, av
+ 1, prefix
);
847 if (!strcmp(av
[1], "remove"))
848 return remove_worktree(ac
- 1, av
+ 1, prefix
);
849 usage_with_options(worktree_usage
, options
);