]> git.ipfire.org Git - thirdparty/git.git/blob - builtin/worktree.c
object-name.h: move declarations for object-name.c functions from cache.h
[thirdparty/git.git] / builtin / worktree.c
1 #include "cache.h"
2 #include "abspath.h"
3 #include "checkout.h"
4 #include "config.h"
5 #include "builtin.h"
6 #include "dir.h"
7 #include "environment.h"
8 #include "gettext.h"
9 #include "hex.h"
10 #include "object-name.h"
11 #include "parse-options.h"
12 #include "strvec.h"
13 #include "branch.h"
14 #include "refs.h"
15 #include "run-command.h"
16 #include "hook.h"
17 #include "sigchain.h"
18 #include "submodule.h"
19 #include "utf8.h"
20 #include "worktree.h"
21 #include "wrapper.h"
22 #include "quote.h"
23
24 #define BUILTIN_WORKTREE_ADD_USAGE \
25 N_("git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n" \
26 " [-b <new-branch>] <path> [<commit-ish>]")
27 #define BUILTIN_WORKTREE_LIST_USAGE \
28 N_("git worktree list [-v | --porcelain [-z]]")
29 #define BUILTIN_WORKTREE_LOCK_USAGE \
30 N_("git worktree lock [--reason <string>] <worktree>")
31 #define BUILTIN_WORKTREE_MOVE_USAGE \
32 N_("git worktree move <worktree> <new-path>")
33 #define BUILTIN_WORKTREE_PRUNE_USAGE \
34 N_("git worktree prune [-n] [-v] [--expire <expire>]")
35 #define BUILTIN_WORKTREE_REMOVE_USAGE \
36 N_("git worktree remove [-f] <worktree>")
37 #define BUILTIN_WORKTREE_REPAIR_USAGE \
38 N_("git worktree repair [<path>...]")
39 #define BUILTIN_WORKTREE_UNLOCK_USAGE \
40 N_("git worktree unlock <worktree>")
41
42 static const char * const git_worktree_usage[] = {
43 BUILTIN_WORKTREE_ADD_USAGE,
44 BUILTIN_WORKTREE_LIST_USAGE,
45 BUILTIN_WORKTREE_LOCK_USAGE,
46 BUILTIN_WORKTREE_MOVE_USAGE,
47 BUILTIN_WORKTREE_PRUNE_USAGE,
48 BUILTIN_WORKTREE_REMOVE_USAGE,
49 BUILTIN_WORKTREE_REPAIR_USAGE,
50 BUILTIN_WORKTREE_UNLOCK_USAGE,
51 NULL
52 };
53
54 static const char * const git_worktree_add_usage[] = {
55 BUILTIN_WORKTREE_ADD_USAGE,
56 NULL,
57 };
58
59 static const char * const git_worktree_list_usage[] = {
60 BUILTIN_WORKTREE_LIST_USAGE,
61 NULL
62 };
63
64 static const char * const git_worktree_lock_usage[] = {
65 BUILTIN_WORKTREE_LOCK_USAGE,
66 NULL
67 };
68
69 static const char * const git_worktree_move_usage[] = {
70 BUILTIN_WORKTREE_MOVE_USAGE,
71 NULL
72 };
73
74 static const char * const git_worktree_prune_usage[] = {
75 BUILTIN_WORKTREE_PRUNE_USAGE,
76 NULL
77 };
78
79 static const char * const git_worktree_remove_usage[] = {
80 BUILTIN_WORKTREE_REMOVE_USAGE,
81 NULL
82 };
83
84 static const char * const git_worktree_repair_usage[] = {
85 BUILTIN_WORKTREE_REPAIR_USAGE,
86 NULL
87 };
88
89 static const char * const git_worktree_unlock_usage[] = {
90 BUILTIN_WORKTREE_UNLOCK_USAGE,
91 NULL
92 };
93
94 struct add_opts {
95 int force;
96 int detach;
97 int quiet;
98 int checkout;
99 const char *keep_locked;
100 };
101
102 static int show_only;
103 static int verbose;
104 static int guess_remote;
105 static timestamp_t expire;
106
107 static int git_worktree_config(const char *var, const char *value, void *cb)
108 {
109 if (!strcmp(var, "worktree.guessremote")) {
110 guess_remote = git_config_bool(var, value);
111 return 0;
112 }
113
114 return git_default_config(var, value, cb);
115 }
116
117 static int delete_git_dir(const char *id)
118 {
119 struct strbuf sb = STRBUF_INIT;
120 int ret;
121
122 strbuf_addstr(&sb, git_common_path("worktrees/%s", id));
123 ret = remove_dir_recursively(&sb, 0);
124 if (ret < 0 && errno == ENOTDIR)
125 ret = unlink(sb.buf);
126 if (ret)
127 error_errno(_("failed to delete '%s'"), sb.buf);
128 strbuf_release(&sb);
129 return ret;
130 }
131
132 static void delete_worktrees_dir_if_empty(void)
133 {
134 rmdir(git_path("worktrees")); /* ignore failed removal */
135 }
136
137 static void prune_worktree(const char *id, const char *reason)
138 {
139 if (show_only || verbose)
140 fprintf_ln(stderr, _("Removing %s/%s: %s"), "worktrees", id, reason);
141 if (!show_only)
142 delete_git_dir(id);
143 }
144
145 static int prune_cmp(const void *a, const void *b)
146 {
147 const struct string_list_item *x = a;
148 const struct string_list_item *y = b;
149 int c;
150
151 if ((c = fspathcmp(x->string, y->string)))
152 return c;
153 /*
154 * paths same; prune_dupes() removes all but the first worktree entry
155 * having the same path, so sort main worktree ('util' is NULL) above
156 * linked worktrees ('util' not NULL) since main worktree can't be
157 * removed
158 */
159 if (!x->util)
160 return -1;
161 if (!y->util)
162 return 1;
163 /* paths same; sort by .git/worktrees/<id> */
164 return strcmp(x->util, y->util);
165 }
166
167 static void prune_dups(struct string_list *l)
168 {
169 int i;
170
171 QSORT(l->items, l->nr, prune_cmp);
172 for (i = 1; i < l->nr; i++) {
173 if (!fspathcmp(l->items[i].string, l->items[i - 1].string))
174 prune_worktree(l->items[i].util, "duplicate entry");
175 }
176 }
177
178 static void prune_worktrees(void)
179 {
180 struct strbuf reason = STRBUF_INIT;
181 struct strbuf main_path = STRBUF_INIT;
182 struct string_list kept = STRING_LIST_INIT_DUP;
183 DIR *dir = opendir(git_path("worktrees"));
184 struct dirent *d;
185 if (!dir)
186 return;
187 while ((d = readdir_skip_dot_and_dotdot(dir)) != NULL) {
188 char *path;
189 strbuf_reset(&reason);
190 if (should_prune_worktree(d->d_name, &reason, &path, expire))
191 prune_worktree(d->d_name, reason.buf);
192 else if (path)
193 string_list_append_nodup(&kept, path)->util = xstrdup(d->d_name);
194 }
195 closedir(dir);
196
197 strbuf_add_absolute_path(&main_path, get_git_common_dir());
198 /* massage main worktree absolute path to match 'gitdir' content */
199 strbuf_strip_suffix(&main_path, "/.");
200 string_list_append_nodup(&kept, strbuf_detach(&main_path, NULL));
201 prune_dups(&kept);
202 string_list_clear(&kept, 1);
203
204 if (!show_only)
205 delete_worktrees_dir_if_empty();
206 strbuf_release(&reason);
207 }
208
209 static int prune(int ac, const char **av, const char *prefix)
210 {
211 struct option options[] = {
212 OPT__DRY_RUN(&show_only, N_("do not remove, show only")),
213 OPT__VERBOSE(&verbose, N_("report pruned working trees")),
214 OPT_EXPIRY_DATE(0, "expire", &expire,
215 N_("expire working trees older than <time>")),
216 OPT_END()
217 };
218
219 expire = TIME_MAX;
220 ac = parse_options(ac, av, prefix, options, git_worktree_prune_usage,
221 0);
222 if (ac)
223 usage_with_options(git_worktree_prune_usage, options);
224 prune_worktrees();
225 return 0;
226 }
227
228 static char *junk_work_tree;
229 static char *junk_git_dir;
230 static int is_junk;
231 static pid_t junk_pid;
232
233 static void remove_junk(void)
234 {
235 struct strbuf sb = STRBUF_INIT;
236 if (!is_junk || getpid() != junk_pid)
237 return;
238 if (junk_git_dir) {
239 strbuf_addstr(&sb, junk_git_dir);
240 remove_dir_recursively(&sb, 0);
241 strbuf_reset(&sb);
242 }
243 if (junk_work_tree) {
244 strbuf_addstr(&sb, junk_work_tree);
245 remove_dir_recursively(&sb, 0);
246 }
247 strbuf_release(&sb);
248 }
249
250 static void remove_junk_on_signal(int signo)
251 {
252 remove_junk();
253 sigchain_pop(signo);
254 raise(signo);
255 }
256
257 static const char *worktree_basename(const char *path, int *olen)
258 {
259 const char *name;
260 int len;
261
262 len = strlen(path);
263 while (len && is_dir_sep(path[len - 1]))
264 len--;
265
266 for (name = path + len - 1; name > path; name--)
267 if (is_dir_sep(*name)) {
268 name++;
269 break;
270 }
271
272 *olen = len;
273 return name;
274 }
275
276 /* check that path is viable location for worktree */
277 static void check_candidate_path(const char *path,
278 int force,
279 struct worktree **worktrees,
280 const char *cmd)
281 {
282 struct worktree *wt;
283 int locked;
284
285 if (file_exists(path) && !is_empty_dir(path))
286 die(_("'%s' already exists"), path);
287
288 wt = find_worktree_by_path(worktrees, path);
289 if (!wt)
290 return;
291
292 locked = !!worktree_lock_reason(wt);
293 if ((!locked && force) || (locked && force > 1)) {
294 if (delete_git_dir(wt->id))
295 die(_("unusable worktree destination '%s'"), path);
296 return;
297 }
298
299 if (locked)
300 die(_("'%s' is a missing but locked worktree;\nuse '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"), path, cmd);
301 else
302 die(_("'%s' is a missing but already registered worktree;\nuse '%s -f' to override, or 'prune' or 'remove' to clear"), path, cmd);
303 }
304
305 static void copy_sparse_checkout(const char *worktree_git_dir)
306 {
307 char *from_file = git_pathdup("info/sparse-checkout");
308 char *to_file = xstrfmt("%s/info/sparse-checkout", worktree_git_dir);
309
310 if (file_exists(from_file)) {
311 if (safe_create_leading_directories(to_file) ||
312 copy_file(to_file, from_file, 0666))
313 error(_("failed to copy '%s' to '%s'; sparse-checkout may not work correctly"),
314 from_file, to_file);
315 }
316
317 free(from_file);
318 free(to_file);
319 }
320
321 static void copy_filtered_worktree_config(const char *worktree_git_dir)
322 {
323 char *from_file = git_pathdup("config.worktree");
324 char *to_file = xstrfmt("%s/config.worktree", worktree_git_dir);
325
326 if (file_exists(from_file)) {
327 struct config_set cs = { { 0 } };
328 const char *core_worktree;
329 int bare;
330
331 if (safe_create_leading_directories(to_file) ||
332 copy_file(to_file, from_file, 0666)) {
333 error(_("failed to copy worktree config from '%s' to '%s'"),
334 from_file, to_file);
335 goto worktree_copy_cleanup;
336 }
337
338 git_configset_init(&cs);
339 git_configset_add_file(&cs, from_file);
340
341 if (!git_configset_get_bool(&cs, "core.bare", &bare) &&
342 bare &&
343 git_config_set_multivar_in_file_gently(
344 to_file, "core.bare", NULL, "true", 0))
345 error(_("failed to unset '%s' in '%s'"),
346 "core.bare", to_file);
347 if (!git_configset_get_value(&cs, "core.worktree", &core_worktree) &&
348 git_config_set_in_file_gently(to_file,
349 "core.worktree", NULL))
350 error(_("failed to unset '%s' in '%s'"),
351 "core.worktree", to_file);
352
353 git_configset_clear(&cs);
354 }
355
356 worktree_copy_cleanup:
357 free(from_file);
358 free(to_file);
359 }
360
361 static int checkout_worktree(const struct add_opts *opts,
362 struct strvec *child_env)
363 {
364 struct child_process cp = CHILD_PROCESS_INIT;
365 cp.git_cmd = 1;
366 strvec_pushl(&cp.args, "reset", "--hard", "--no-recurse-submodules", NULL);
367 if (opts->quiet)
368 strvec_push(&cp.args, "--quiet");
369 strvec_pushv(&cp.env, child_env->v);
370 return run_command(&cp);
371 }
372
373 static int add_worktree(const char *path, const char *refname,
374 const struct add_opts *opts)
375 {
376 struct strbuf sb_git = STRBUF_INIT, sb_repo = STRBUF_INIT;
377 struct strbuf sb = STRBUF_INIT, realpath = STRBUF_INIT;
378 const char *name;
379 struct child_process cp = CHILD_PROCESS_INIT;
380 struct strvec child_env = STRVEC_INIT;
381 unsigned int counter = 0;
382 int len, ret;
383 struct strbuf symref = STRBUF_INIT;
384 struct commit *commit = NULL;
385 int is_branch = 0;
386 struct strbuf sb_name = STRBUF_INIT;
387 struct worktree **worktrees;
388
389 worktrees = get_worktrees();
390 check_candidate_path(path, opts->force, worktrees, "add");
391 free_worktrees(worktrees);
392 worktrees = NULL;
393
394 /* is 'refname' a branch or commit? */
395 if (!opts->detach && !strbuf_check_branch_ref(&symref, refname) &&
396 ref_exists(symref.buf)) {
397 is_branch = 1;
398 if (!opts->force)
399 die_if_checked_out(symref.buf, 0);
400 }
401 commit = lookup_commit_reference_by_name(refname);
402 if (!commit)
403 die(_("invalid reference: %s"), refname);
404
405 name = worktree_basename(path, &len);
406 strbuf_add(&sb, name, path + len - name);
407 sanitize_refname_component(sb.buf, &sb_name);
408 if (!sb_name.len)
409 BUG("How come '%s' becomes empty after sanitization?", sb.buf);
410 strbuf_reset(&sb);
411 name = sb_name.buf;
412 git_path_buf(&sb_repo, "worktrees/%s", name);
413 len = sb_repo.len;
414 if (safe_create_leading_directories_const(sb_repo.buf))
415 die_errno(_("could not create leading directories of '%s'"),
416 sb_repo.buf);
417
418 while (mkdir(sb_repo.buf, 0777)) {
419 counter++;
420 if ((errno != EEXIST) || !counter /* overflow */)
421 die_errno(_("could not create directory of '%s'"),
422 sb_repo.buf);
423 strbuf_setlen(&sb_repo, len);
424 strbuf_addf(&sb_repo, "%d", counter);
425 }
426 name = strrchr(sb_repo.buf, '/') + 1;
427
428 junk_pid = getpid();
429 atexit(remove_junk);
430 sigchain_push_common(remove_junk_on_signal);
431
432 junk_git_dir = xstrdup(sb_repo.buf);
433 is_junk = 1;
434
435 /*
436 * lock the incomplete repo so prune won't delete it, unlock
437 * after the preparation is over.
438 */
439 strbuf_addf(&sb, "%s/locked", sb_repo.buf);
440 if (opts->keep_locked)
441 write_file(sb.buf, "%s", opts->keep_locked);
442 else
443 write_file(sb.buf, _("initializing"));
444
445 strbuf_addf(&sb_git, "%s/.git", path);
446 if (safe_create_leading_directories_const(sb_git.buf))
447 die_errno(_("could not create leading directories of '%s'"),
448 sb_git.buf);
449 junk_work_tree = xstrdup(path);
450
451 strbuf_reset(&sb);
452 strbuf_addf(&sb, "%s/gitdir", sb_repo.buf);
453 strbuf_realpath(&realpath, sb_git.buf, 1);
454 write_file(sb.buf, "%s", realpath.buf);
455 strbuf_realpath(&realpath, get_git_common_dir(), 1);
456 write_file(sb_git.buf, "gitdir: %s/worktrees/%s",
457 realpath.buf, name);
458 /*
459 * This is to keep resolve_ref() happy. We need a valid HEAD
460 * or is_git_directory() will reject the directory. Any value which
461 * looks like an object ID will do since it will be immediately
462 * replaced by the symbolic-ref or update-ref invocation in the new
463 * worktree.
464 */
465 strbuf_reset(&sb);
466 strbuf_addf(&sb, "%s/HEAD", sb_repo.buf);
467 write_file(sb.buf, "%s", oid_to_hex(null_oid()));
468 strbuf_reset(&sb);
469 strbuf_addf(&sb, "%s/commondir", sb_repo.buf);
470 write_file(sb.buf, "../..");
471
472 /*
473 * If the current worktree has sparse-checkout enabled, then copy
474 * the sparse-checkout patterns from the current worktree.
475 */
476 if (core_apply_sparse_checkout)
477 copy_sparse_checkout(sb_repo.buf);
478
479 /*
480 * If we are using worktree config, then copy all current config
481 * values from the current worktree into the new one, that way the
482 * new worktree behaves the same as this one.
483 */
484 if (repository_format_worktree_config)
485 copy_filtered_worktree_config(sb_repo.buf);
486
487 strvec_pushf(&child_env, "%s=%s", GIT_DIR_ENVIRONMENT, sb_git.buf);
488 strvec_pushf(&child_env, "%s=%s", GIT_WORK_TREE_ENVIRONMENT, path);
489 cp.git_cmd = 1;
490
491 if (!is_branch)
492 strvec_pushl(&cp.args, "update-ref", "HEAD",
493 oid_to_hex(&commit->object.oid), NULL);
494 else {
495 strvec_pushl(&cp.args, "symbolic-ref", "HEAD",
496 symref.buf, NULL);
497 if (opts->quiet)
498 strvec_push(&cp.args, "--quiet");
499 }
500
501 strvec_pushv(&cp.env, child_env.v);
502 ret = run_command(&cp);
503 if (ret)
504 goto done;
505
506 if (opts->checkout &&
507 (ret = checkout_worktree(opts, &child_env)))
508 goto done;
509
510 is_junk = 0;
511 FREE_AND_NULL(junk_work_tree);
512 FREE_AND_NULL(junk_git_dir);
513
514 done:
515 if (ret || !opts->keep_locked) {
516 strbuf_reset(&sb);
517 strbuf_addf(&sb, "%s/locked", sb_repo.buf);
518 unlink_or_warn(sb.buf);
519 }
520
521 /*
522 * Hook failure does not warrant worktree deletion, so run hook after
523 * is_junk is cleared, but do return appropriate code when hook fails.
524 */
525 if (!ret && opts->checkout) {
526 struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
527
528 strvec_pushl(&opt.env, "GIT_DIR", "GIT_WORK_TREE", NULL);
529 strvec_pushl(&opt.args,
530 oid_to_hex(null_oid()),
531 oid_to_hex(&commit->object.oid),
532 "1",
533 NULL);
534 opt.dir = path;
535
536 ret = run_hooks_opt("post-checkout", &opt);
537 }
538
539 strvec_clear(&child_env);
540 strbuf_release(&sb);
541 strbuf_release(&symref);
542 strbuf_release(&sb_repo);
543 strbuf_release(&sb_git);
544 strbuf_release(&sb_name);
545 strbuf_release(&realpath);
546 return ret;
547 }
548
549 static void print_preparing_worktree_line(int detach,
550 const char *branch,
551 const char *new_branch,
552 int force_new_branch)
553 {
554 if (force_new_branch) {
555 struct commit *commit = lookup_commit_reference_by_name(new_branch);
556 if (!commit)
557 fprintf_ln(stderr, _("Preparing worktree (new branch '%s')"), new_branch);
558 else
559 fprintf_ln(stderr, _("Preparing worktree (resetting branch '%s'; was at %s)"),
560 new_branch,
561 repo_find_unique_abbrev(the_repository, &commit->object.oid, DEFAULT_ABBREV));
562 } else if (new_branch) {
563 fprintf_ln(stderr, _("Preparing worktree (new branch '%s')"), new_branch);
564 } else {
565 struct strbuf s = STRBUF_INIT;
566 if (!detach && !strbuf_check_branch_ref(&s, branch) &&
567 ref_exists(s.buf))
568 fprintf_ln(stderr, _("Preparing worktree (checking out '%s')"),
569 branch);
570 else {
571 struct commit *commit = lookup_commit_reference_by_name(branch);
572 if (!commit)
573 die(_("invalid reference: %s"), branch);
574 fprintf_ln(stderr, _("Preparing worktree (detached HEAD %s)"),
575 repo_find_unique_abbrev(the_repository, &commit->object.oid, DEFAULT_ABBREV));
576 }
577 strbuf_release(&s);
578 }
579 }
580
581 static const char *dwim_branch(const char *path, const char **new_branch)
582 {
583 int n;
584 int branch_exists;
585 const char *s = worktree_basename(path, &n);
586 const char *branchname = xstrndup(s, n);
587 struct strbuf ref = STRBUF_INIT;
588
589 UNLEAK(branchname);
590
591 branch_exists = !strbuf_check_branch_ref(&ref, branchname) &&
592 ref_exists(ref.buf);
593 strbuf_release(&ref);
594 if (branch_exists)
595 return branchname;
596
597 *new_branch = branchname;
598 if (guess_remote) {
599 struct object_id oid;
600 const char *remote =
601 unique_tracking_name(*new_branch, &oid, NULL);
602 return remote;
603 }
604 return NULL;
605 }
606
607 static int add(int ac, const char **av, const char *prefix)
608 {
609 struct add_opts opts;
610 const char *new_branch_force = NULL;
611 char *path;
612 const char *branch;
613 const char *new_branch = NULL;
614 const char *opt_track = NULL;
615 const char *lock_reason = NULL;
616 int keep_locked = 0;
617 struct option options[] = {
618 OPT__FORCE(&opts.force,
619 N_("checkout <branch> even if already checked out in other worktree"),
620 PARSE_OPT_NOCOMPLETE),
621 OPT_STRING('b', NULL, &new_branch, N_("branch"),
622 N_("create a new branch")),
623 OPT_STRING('B', NULL, &new_branch_force, N_("branch"),
624 N_("create or reset a branch")),
625 OPT_BOOL('d', "detach", &opts.detach, N_("detach HEAD at named commit")),
626 OPT_BOOL(0, "checkout", &opts.checkout, N_("populate the new working tree")),
627 OPT_BOOL(0, "lock", &keep_locked, N_("keep the new working tree locked")),
628 OPT_STRING(0, "reason", &lock_reason, N_("string"),
629 N_("reason for locking")),
630 OPT__QUIET(&opts.quiet, N_("suppress progress reporting")),
631 OPT_PASSTHRU(0, "track", &opt_track, NULL,
632 N_("set up tracking mode (see git-branch(1))"),
633 PARSE_OPT_NOARG | PARSE_OPT_OPTARG),
634 OPT_BOOL(0, "guess-remote", &guess_remote,
635 N_("try to match the new branch name with a remote-tracking branch")),
636 OPT_END()
637 };
638 int ret;
639
640 memset(&opts, 0, sizeof(opts));
641 opts.checkout = 1;
642 ac = parse_options(ac, av, prefix, options, git_worktree_add_usage, 0);
643 if (!!opts.detach + !!new_branch + !!new_branch_force > 1)
644 die(_("options '%s', '%s', and '%s' cannot be used together"), "-b", "-B", "--detach");
645 if (lock_reason && !keep_locked)
646 die(_("the option '%s' requires '%s'"), "--reason", "--lock");
647 if (lock_reason)
648 opts.keep_locked = lock_reason;
649 else if (keep_locked)
650 opts.keep_locked = _("added with --lock");
651
652 if (ac < 1 || ac > 2)
653 usage_with_options(git_worktree_add_usage, options);
654
655 path = prefix_filename(prefix, av[0]);
656 branch = ac < 2 ? "HEAD" : av[1];
657
658 if (!strcmp(branch, "-"))
659 branch = "@{-1}";
660
661 if (new_branch_force) {
662 struct strbuf symref = STRBUF_INIT;
663
664 new_branch = new_branch_force;
665
666 if (!opts.force &&
667 !strbuf_check_branch_ref(&symref, new_branch) &&
668 ref_exists(symref.buf))
669 die_if_checked_out(symref.buf, 0);
670 strbuf_release(&symref);
671 }
672
673 if (ac < 2 && !new_branch && !opts.detach) {
674 const char *s = dwim_branch(path, &new_branch);
675 if (s)
676 branch = s;
677 }
678
679 if (ac == 2 && !new_branch && !opts.detach) {
680 struct object_id oid;
681 struct commit *commit;
682 const char *remote;
683
684 commit = lookup_commit_reference_by_name(branch);
685 if (!commit) {
686 remote = unique_tracking_name(branch, &oid, NULL);
687 if (remote) {
688 new_branch = branch;
689 branch = remote;
690 }
691 }
692 }
693 if (!opts.quiet)
694 print_preparing_worktree_line(opts.detach, branch, new_branch, !!new_branch_force);
695
696 if (new_branch) {
697 struct child_process cp = CHILD_PROCESS_INIT;
698 cp.git_cmd = 1;
699 strvec_push(&cp.args, "branch");
700 if (new_branch_force)
701 strvec_push(&cp.args, "--force");
702 if (opts.quiet)
703 strvec_push(&cp.args, "--quiet");
704 strvec_push(&cp.args, new_branch);
705 strvec_push(&cp.args, branch);
706 if (opt_track)
707 strvec_push(&cp.args, opt_track);
708 if (run_command(&cp))
709 return -1;
710 branch = new_branch;
711 } else if (opt_track) {
712 die(_("--[no-]track can only be used if a new branch is created"));
713 }
714
715 ret = add_worktree(path, branch, &opts);
716 free(path);
717 return ret;
718 }
719
720 static void show_worktree_porcelain(struct worktree *wt, int line_terminator)
721 {
722 const char *reason;
723
724 printf("worktree %s%c", wt->path, line_terminator);
725 if (wt->is_bare)
726 printf("bare%c", line_terminator);
727 else {
728 printf("HEAD %s%c", oid_to_hex(&wt->head_oid), line_terminator);
729 if (wt->is_detached)
730 printf("detached%c", line_terminator);
731 else if (wt->head_ref)
732 printf("branch %s%c", wt->head_ref, line_terminator);
733 }
734
735 reason = worktree_lock_reason(wt);
736 if (reason) {
737 fputs("locked", stdout);
738 if (*reason) {
739 fputc(' ', stdout);
740 write_name_quoted(reason, stdout, line_terminator);
741 } else {
742 fputc(line_terminator, stdout);
743 }
744 }
745
746 reason = worktree_prune_reason(wt, expire);
747 if (reason)
748 printf("prunable %s%c", reason, line_terminator);
749
750 fputc(line_terminator, stdout);
751 }
752
753 static void show_worktree(struct worktree *wt, int path_maxlen, int abbrev_len)
754 {
755 struct strbuf sb = STRBUF_INIT;
756 int cur_path_len = strlen(wt->path);
757 int path_adj = cur_path_len - utf8_strwidth(wt->path);
758 const char *reason;
759
760 strbuf_addf(&sb, "%-*s ", 1 + path_maxlen + path_adj, wt->path);
761 if (wt->is_bare)
762 strbuf_addstr(&sb, "(bare)");
763 else {
764 strbuf_addf(&sb, "%-*s ", abbrev_len,
765 repo_find_unique_abbrev(the_repository, &wt->head_oid, DEFAULT_ABBREV));
766 if (wt->is_detached)
767 strbuf_addstr(&sb, "(detached HEAD)");
768 else if (wt->head_ref) {
769 char *ref = shorten_unambiguous_ref(wt->head_ref, 0);
770 strbuf_addf(&sb, "[%s]", ref);
771 free(ref);
772 } else
773 strbuf_addstr(&sb, "(error)");
774 }
775
776 reason = worktree_lock_reason(wt);
777 if (verbose && reason && *reason)
778 strbuf_addf(&sb, "\n\tlocked: %s", reason);
779 else if (reason)
780 strbuf_addstr(&sb, " locked");
781
782 reason = worktree_prune_reason(wt, expire);
783 if (verbose && reason)
784 strbuf_addf(&sb, "\n\tprunable: %s", reason);
785 else if (reason)
786 strbuf_addstr(&sb, " prunable");
787
788 printf("%s\n", sb.buf);
789 strbuf_release(&sb);
790 }
791
792 static void measure_widths(struct worktree **wt, int *abbrev, int *maxlen)
793 {
794 int i;
795
796 for (i = 0; wt[i]; i++) {
797 int sha1_len;
798 int path_len = strlen(wt[i]->path);
799
800 if (path_len > *maxlen)
801 *maxlen = path_len;
802 sha1_len = strlen(repo_find_unique_abbrev(the_repository, &wt[i]->head_oid, *abbrev));
803 if (sha1_len > *abbrev)
804 *abbrev = sha1_len;
805 }
806 }
807
808 static int pathcmp(const void *a_, const void *b_)
809 {
810 const struct worktree *const *a = a_;
811 const struct worktree *const *b = b_;
812 return fspathcmp((*a)->path, (*b)->path);
813 }
814
815 static void pathsort(struct worktree **wt)
816 {
817 int n = 0;
818 struct worktree **p = wt;
819
820 while (*p++)
821 n++;
822 QSORT(wt, n, pathcmp);
823 }
824
825 static int list(int ac, const char **av, const char *prefix)
826 {
827 int porcelain = 0;
828 int line_terminator = '\n';
829
830 struct option options[] = {
831 OPT_BOOL(0, "porcelain", &porcelain, N_("machine-readable output")),
832 OPT__VERBOSE(&verbose, N_("show extended annotations and reasons, if available")),
833 OPT_EXPIRY_DATE(0, "expire", &expire,
834 N_("add 'prunable' annotation to worktrees older than <time>")),
835 OPT_SET_INT('z', NULL, &line_terminator,
836 N_("terminate records with a NUL character"), '\0'),
837 OPT_END()
838 };
839
840 expire = TIME_MAX;
841 ac = parse_options(ac, av, prefix, options, git_worktree_list_usage, 0);
842 if (ac)
843 usage_with_options(git_worktree_list_usage, options);
844 else if (verbose && porcelain)
845 die(_("options '%s' and '%s' cannot be used together"), "--verbose", "--porcelain");
846 else if (!line_terminator && !porcelain)
847 die(_("the option '%s' requires '%s'"), "-z", "--porcelain");
848 else {
849 struct worktree **worktrees = get_worktrees();
850 int path_maxlen = 0, abbrev = DEFAULT_ABBREV, i;
851
852 /* sort worktrees by path but keep main worktree at top */
853 pathsort(worktrees + 1);
854
855 if (!porcelain)
856 measure_widths(worktrees, &abbrev, &path_maxlen);
857
858 for (i = 0; worktrees[i]; i++) {
859 if (porcelain)
860 show_worktree_porcelain(worktrees[i],
861 line_terminator);
862 else
863 show_worktree(worktrees[i], path_maxlen, abbrev);
864 }
865 free_worktrees(worktrees);
866 }
867 return 0;
868 }
869
870 static int lock_worktree(int ac, const char **av, const char *prefix)
871 {
872 const char *reason = "", *old_reason;
873 struct option options[] = {
874 OPT_STRING(0, "reason", &reason, N_("string"),
875 N_("reason for locking")),
876 OPT_END()
877 };
878 struct worktree **worktrees, *wt;
879
880 ac = parse_options(ac, av, prefix, options, git_worktree_lock_usage, 0);
881 if (ac != 1)
882 usage_with_options(git_worktree_lock_usage, options);
883
884 worktrees = get_worktrees();
885 wt = find_worktree(worktrees, prefix, av[0]);
886 if (!wt)
887 die(_("'%s' is not a working tree"), av[0]);
888 if (is_main_worktree(wt))
889 die(_("The main working tree cannot be locked or unlocked"));
890
891 old_reason = worktree_lock_reason(wt);
892 if (old_reason) {
893 if (*old_reason)
894 die(_("'%s' is already locked, reason: %s"),
895 av[0], old_reason);
896 die(_("'%s' is already locked"), av[0]);
897 }
898
899 write_file(git_common_path("worktrees/%s/locked", wt->id),
900 "%s", reason);
901 free_worktrees(worktrees);
902 return 0;
903 }
904
905 static int unlock_worktree(int ac, const char **av, const char *prefix)
906 {
907 struct option options[] = {
908 OPT_END()
909 };
910 struct worktree **worktrees, *wt;
911 int ret;
912
913 ac = parse_options(ac, av, prefix, options, git_worktree_unlock_usage, 0);
914 if (ac != 1)
915 usage_with_options(git_worktree_unlock_usage, options);
916
917 worktrees = get_worktrees();
918 wt = find_worktree(worktrees, prefix, av[0]);
919 if (!wt)
920 die(_("'%s' is not a working tree"), av[0]);
921 if (is_main_worktree(wt))
922 die(_("The main working tree cannot be locked or unlocked"));
923 if (!worktree_lock_reason(wt))
924 die(_("'%s' is not locked"), av[0]);
925 ret = unlink_or_warn(git_common_path("worktrees/%s/locked", wt->id));
926 free_worktrees(worktrees);
927 return ret;
928 }
929
930 static void validate_no_submodules(const struct worktree *wt)
931 {
932 struct index_state istate = INDEX_STATE_INIT(the_repository);
933 struct strbuf path = STRBUF_INIT;
934 int i, found_submodules = 0;
935
936 if (is_directory(worktree_git_path(wt, "modules"))) {
937 /*
938 * There could be false positives, e.g. the "modules"
939 * directory exists but is empty. But it's a rare case and
940 * this simpler check is probably good enough for now.
941 */
942 found_submodules = 1;
943 } else if (read_index_from(&istate, worktree_git_path(wt, "index"),
944 get_worktree_git_dir(wt)) > 0) {
945 for (i = 0; i < istate.cache_nr; i++) {
946 struct cache_entry *ce = istate.cache[i];
947 int err;
948
949 if (!S_ISGITLINK(ce->ce_mode))
950 continue;
951
952 strbuf_reset(&path);
953 strbuf_addf(&path, "%s/%s", wt->path, ce->name);
954 if (!is_submodule_populated_gently(path.buf, &err))
955 continue;
956
957 found_submodules = 1;
958 break;
959 }
960 }
961 discard_index(&istate);
962 strbuf_release(&path);
963
964 if (found_submodules)
965 die(_("working trees containing submodules cannot be moved or removed"));
966 }
967
968 static int move_worktree(int ac, const char **av, const char *prefix)
969 {
970 int force = 0;
971 struct option options[] = {
972 OPT__FORCE(&force,
973 N_("force move even if worktree is dirty or locked"),
974 PARSE_OPT_NOCOMPLETE),
975 OPT_END()
976 };
977 struct worktree **worktrees, *wt;
978 struct strbuf dst = STRBUF_INIT;
979 struct strbuf errmsg = STRBUF_INIT;
980 const char *reason = NULL;
981 char *path;
982
983 ac = parse_options(ac, av, prefix, options, git_worktree_move_usage,
984 0);
985 if (ac != 2)
986 usage_with_options(git_worktree_move_usage, options);
987
988 path = prefix_filename(prefix, av[1]);
989 strbuf_addstr(&dst, path);
990 free(path);
991
992 worktrees = get_worktrees();
993 wt = find_worktree(worktrees, prefix, av[0]);
994 if (!wt)
995 die(_("'%s' is not a working tree"), av[0]);
996 if (is_main_worktree(wt))
997 die(_("'%s' is a main working tree"), av[0]);
998 if (is_directory(dst.buf)) {
999 const char *sep = find_last_dir_sep(wt->path);
1000
1001 if (!sep)
1002 die(_("could not figure out destination name from '%s'"),
1003 wt->path);
1004 strbuf_trim_trailing_dir_sep(&dst);
1005 strbuf_addstr(&dst, sep);
1006 }
1007 check_candidate_path(dst.buf, force, worktrees, "move");
1008
1009 validate_no_submodules(wt);
1010
1011 if (force < 2)
1012 reason = worktree_lock_reason(wt);
1013 if (reason) {
1014 if (*reason)
1015 die(_("cannot move a locked working tree, lock reason: %s\nuse 'move -f -f' to override or unlock first"),
1016 reason);
1017 die(_("cannot move a locked working tree;\nuse 'move -f -f' to override or unlock first"));
1018 }
1019 if (validate_worktree(wt, &errmsg, 0))
1020 die(_("validation failed, cannot move working tree: %s"),
1021 errmsg.buf);
1022 strbuf_release(&errmsg);
1023
1024 if (rename(wt->path, dst.buf) == -1)
1025 die_errno(_("failed to move '%s' to '%s'"), wt->path, dst.buf);
1026
1027 update_worktree_location(wt, dst.buf);
1028
1029 strbuf_release(&dst);
1030 free_worktrees(worktrees);
1031 return 0;
1032 }
1033
1034 /*
1035 * Note, "git status --porcelain" is used to determine if it's safe to
1036 * delete a whole worktree. "git status" does not ignore user
1037 * configuration, so if a normal "git status" shows "clean" for the
1038 * user, then it's ok to remove it.
1039 *
1040 * This assumption may be a bad one. We may want to ignore
1041 * (potentially bad) user settings and only delete a worktree when
1042 * it's absolutely safe to do so from _our_ point of view because we
1043 * know better.
1044 */
1045 static void check_clean_worktree(struct worktree *wt,
1046 const char *original_path)
1047 {
1048 struct child_process cp;
1049 char buf[1];
1050 int ret;
1051
1052 /*
1053 * Until we sort this out, all submodules are "dirty" and
1054 * will abort this function.
1055 */
1056 validate_no_submodules(wt);
1057
1058 child_process_init(&cp);
1059 strvec_pushf(&cp.env, "%s=%s/.git",
1060 GIT_DIR_ENVIRONMENT, wt->path);
1061 strvec_pushf(&cp.env, "%s=%s",
1062 GIT_WORK_TREE_ENVIRONMENT, wt->path);
1063 strvec_pushl(&cp.args, "status",
1064 "--porcelain", "--ignore-submodules=none",
1065 NULL);
1066 cp.git_cmd = 1;
1067 cp.dir = wt->path;
1068 cp.out = -1;
1069 ret = start_command(&cp);
1070 if (ret)
1071 die_errno(_("failed to run 'git status' on '%s'"),
1072 original_path);
1073 ret = xread(cp.out, buf, sizeof(buf));
1074 if (ret)
1075 die(_("'%s' contains modified or untracked files, use --force to delete it"),
1076 original_path);
1077 close(cp.out);
1078 ret = finish_command(&cp);
1079 if (ret)
1080 die_errno(_("failed to run 'git status' on '%s', code %d"),
1081 original_path, ret);
1082 }
1083
1084 static int delete_git_work_tree(struct worktree *wt)
1085 {
1086 struct strbuf sb = STRBUF_INIT;
1087 int ret = 0;
1088
1089 strbuf_addstr(&sb, wt->path);
1090 if (remove_dir_recursively(&sb, 0)) {
1091 error_errno(_("failed to delete '%s'"), sb.buf);
1092 ret = -1;
1093 }
1094 strbuf_release(&sb);
1095 return ret;
1096 }
1097
1098 static int remove_worktree(int ac, const char **av, const char *prefix)
1099 {
1100 int force = 0;
1101 struct option options[] = {
1102 OPT__FORCE(&force,
1103 N_("force removal even if worktree is dirty or locked"),
1104 PARSE_OPT_NOCOMPLETE),
1105 OPT_END()
1106 };
1107 struct worktree **worktrees, *wt;
1108 struct strbuf errmsg = STRBUF_INIT;
1109 const char *reason = NULL;
1110 int ret = 0;
1111
1112 ac = parse_options(ac, av, prefix, options, git_worktree_remove_usage, 0);
1113 if (ac != 1)
1114 usage_with_options(git_worktree_remove_usage, options);
1115
1116 worktrees = get_worktrees();
1117 wt = find_worktree(worktrees, prefix, av[0]);
1118 if (!wt)
1119 die(_("'%s' is not a working tree"), av[0]);
1120 if (is_main_worktree(wt))
1121 die(_("'%s' is a main working tree"), av[0]);
1122 if (force < 2)
1123 reason = worktree_lock_reason(wt);
1124 if (reason) {
1125 if (*reason)
1126 die(_("cannot remove a locked working tree, lock reason: %s\nuse 'remove -f -f' to override or unlock first"),
1127 reason);
1128 die(_("cannot remove a locked working tree;\nuse 'remove -f -f' to override or unlock first"));
1129 }
1130 if (validate_worktree(wt, &errmsg, WT_VALIDATE_WORKTREE_MISSING_OK))
1131 die(_("validation failed, cannot remove working tree: %s"),
1132 errmsg.buf);
1133 strbuf_release(&errmsg);
1134
1135 if (file_exists(wt->path)) {
1136 if (!force)
1137 check_clean_worktree(wt, av[0]);
1138
1139 ret |= delete_git_work_tree(wt);
1140 }
1141 /*
1142 * continue on even if ret is non-zero, there's no going back
1143 * from here.
1144 */
1145 ret |= delete_git_dir(wt->id);
1146 delete_worktrees_dir_if_empty();
1147
1148 free_worktrees(worktrees);
1149 return ret;
1150 }
1151
1152 static void report_repair(int iserr, const char *path, const char *msg, void *cb_data)
1153 {
1154 if (!iserr) {
1155 fprintf_ln(stderr, _("repair: %s: %s"), msg, path);
1156 } else {
1157 int *exit_status = (int *)cb_data;
1158 fprintf_ln(stderr, _("error: %s: %s"), msg, path);
1159 *exit_status = 1;
1160 }
1161 }
1162
1163 static int repair(int ac, const char **av, const char *prefix)
1164 {
1165 const char **p;
1166 const char *self[] = { ".", NULL };
1167 struct option options[] = {
1168 OPT_END()
1169 };
1170 int rc = 0;
1171
1172 ac = parse_options(ac, av, prefix, options, git_worktree_repair_usage, 0);
1173 p = ac > 0 ? av : self;
1174 for (; *p; p++)
1175 repair_worktree_at_path(*p, report_repair, &rc);
1176 repair_worktrees(report_repair, &rc);
1177 return rc;
1178 }
1179
1180 int cmd_worktree(int ac, const char **av, const char *prefix)
1181 {
1182 parse_opt_subcommand_fn *fn = NULL;
1183 struct option options[] = {
1184 OPT_SUBCOMMAND("add", &fn, add),
1185 OPT_SUBCOMMAND("prune", &fn, prune),
1186 OPT_SUBCOMMAND("list", &fn, list),
1187 OPT_SUBCOMMAND("lock", &fn, lock_worktree),
1188 OPT_SUBCOMMAND("unlock", &fn, unlock_worktree),
1189 OPT_SUBCOMMAND("move", &fn, move_worktree),
1190 OPT_SUBCOMMAND("remove", &fn, remove_worktree),
1191 OPT_SUBCOMMAND("repair", &fn, repair),
1192 OPT_END()
1193 };
1194
1195 git_config(git_worktree_config, NULL);
1196
1197 if (!prefix)
1198 prefix = "";
1199
1200 ac = parse_options(ac, av, prefix, options, git_worktree_usage, 0);
1201 return fn(ac, av, prefix);
1202 }