]> git.ipfire.org Git - thirdparty/git.git/blame - builtin/worktree.c
worktree: make "move" refuse to move atop missing registered worktree
[thirdparty/git.git] / builtin / worktree.c
CommitLineData
df0b6cfb 1#include "cache.h"
4e853331 2#include "checkout.h"
b2141fc1 3#include "config.h"
df0b6cfb
NTND
4#include "builtin.h"
5#include "dir.h"
6#include "parse-options.h"
fc56361f 7#include "argv-array.h"
f7c9dac1
ES
8#include "branch.h"
9#include "refs.h"
fc56361f 10#include "run-command.h"
b979d950 11#include "sigchain.h"
00a6d4d1 12#include "submodule.h"
bb9c03b8
MR
13#include "utf8.h"
14#include "worktree.h"
df0b6cfb
NTND
15
16static const char * const worktree_usage[] = {
b780e440 17 N_("git worktree add [<options>] <path> [<commit-ish>]"),
bb9c03b8 18 N_("git worktree list [<options>]"),
58142c09 19 N_("git worktree lock [<options>] <path>"),
9f792bb4 20 N_("git worktree move <worktree> <new-path>"),
7b722d90 21 N_("git worktree prune [<options>]"),
cc73385c 22 N_("git worktree remove [<options>] <worktree>"),
6d308627 23 N_("git worktree unlock <path>"),
df0b6cfb
NTND
24 NULL
25};
26
5dd6e234
ES
27struct add_opts {
28 int force;
29 int detach;
371979c2 30 int quiet;
ef2a0ac9 31 int checkout;
507e6e9e 32 int keep_locked;
5dd6e234
ES
33};
34
df0b6cfb
NTND
35static int show_only;
36static int verbose;
e92445a7 37static int guess_remote;
dddbad72 38static timestamp_t expire;
df0b6cfb 39
e92445a7
TG
40static int git_worktree_config(const char *var, const char *value, void *cb)
41{
42 if (!strcmp(var, "worktree.guessremote")) {
43 guess_remote = git_config_bool(var, value);
44 return 0;
45 }
46
47 return git_default_config(var, value, cb);
48}
49
602aaed0 50static int delete_git_dir(const char *id)
e5353bef
ES
51{
52 struct strbuf sb = STRBUF_INIT;
602aaed0 53 int ret;
e5353bef 54
602aaed0
ES
55 strbuf_addstr(&sb, git_common_path("worktrees/%s", id));
56 ret = remove_dir_recursively(&sb, 0);
57 if (ret < 0 && errno == ENOTDIR)
58 ret = unlink(sb.buf);
59 if (ret)
e5353bef 60 error_errno(_("failed to delete '%s'"), sb.buf);
e5353bef
ES
61 strbuf_release(&sb);
62 return ret;
63}
64
3a540433
ES
65static void delete_worktrees_dir_if_empty(void)
66{
67 rmdir(git_path("worktrees")); /* ignore failed removal */
68}
69
4a3ce479
ES
70/*
71 * Return true if worktree entry should be pruned, along with the reason for
72 * pruning. Otherwise, return false and the worktree's path, or NULL if it
73 * cannot be determined. Caller is responsible for freeing returned path.
74 */
75static int should_prune_worktree(const char *id, struct strbuf *reason, char **wtpath)
df0b6cfb
NTND
76{
77 struct stat st;
78 char *path;
228740b6
JK
79 int fd;
80 size_t len;
8a1a8d2a 81 ssize_t read_result;
df0b6cfb 82
4a3ce479 83 *wtpath = NULL;
df0b6cfb 84 if (!is_directory(git_path("worktrees/%s", id))) {
c9b77f2c 85 strbuf_addstr(reason, _("not a valid directory"));
df0b6cfb
NTND
86 return 1;
87 }
88 if (file_exists(git_path("worktrees/%s/locked", id)))
89 return 0;
90 if (stat(git_path("worktrees/%s/gitdir", id), &st)) {
c9b77f2c 91 strbuf_addstr(reason, _("gitdir file does not exist"));
df0b6cfb
NTND
92 return 1;
93 }
94 fd = open(git_path("worktrees/%s/gitdir", id), O_RDONLY);
95 if (fd < 0) {
c9b77f2c
ES
96 strbuf_addf(reason, _("unable to read gitdir file (%s)"),
97 strerror(errno));
df0b6cfb
NTND
98 return 1;
99 }
228740b6 100 len = xsize_t(st.st_size);
3733e694 101 path = xmallocz(len);
8a1a8d2a
JK
102
103 read_result = read_in_full(fd, path, len);
104 if (read_result < 0) {
c9b77f2c
ES
105 strbuf_addf(reason, _("unable to read gitdir file (%s)"),
106 strerror(errno));
8a1a8d2a
JK
107 close(fd);
108 free(path);
109 return 1;
110 }
df0b6cfb 111 close(fd);
8a1a8d2a
JK
112
113 if (read_result != len) {
114 strbuf_addf(reason,
c9b77f2c
ES
115 _("short read (expected %"PRIuMAX" bytes, read %"PRIuMAX")"),
116 (uintmax_t)len, (uintmax_t)read_result);
8a1a8d2a
JK
117 free(path);
118 return 1;
119 }
df0b6cfb
NTND
120 while (len && (path[len - 1] == '\n' || path[len - 1] == '\r'))
121 len--;
122 if (!len) {
c9b77f2c 123 strbuf_addstr(reason, _("invalid gitdir file"));
df0b6cfb
NTND
124 free(path);
125 return 1;
126 }
127 path[len] = '\0';
128 if (!file_exists(path)) {
327864aa
NTND
129 if (stat(git_path("worktrees/%s/index", id), &st) ||
130 st.st_mtime <= expire) {
c9b77f2c 131 strbuf_addstr(reason, _("gitdir file points to non-existent location"));
4a3ce479 132 free(path);
df0b6cfb
NTND
133 return 1;
134 } else {
4a3ce479 135 *wtpath = path;
df0b6cfb
NTND
136 return 0;
137 }
138 }
4a3ce479 139 *wtpath = path;
df0b6cfb
NTND
140 return 0;
141}
142
dd9609a1
ES
143static void prune_worktree(const char *id, const char *reason)
144{
145 if (show_only || verbose)
146 printf_ln(_("Removing %s/%s: %s"), "worktrees", id, reason);
147 if (!show_only)
148 delete_git_dir(id);
149}
150
4a3ce479
ES
151static int prune_cmp(const void *a, const void *b)
152{
153 const struct string_list_item *x = a;
154 const struct string_list_item *y = b;
155 int c;
156
157 if ((c = fspathcmp(x->string, y->string)))
158 return c;
916133ef
ES
159 /*
160 * paths same; prune_dupes() removes all but the first worktree entry
161 * having the same path, so sort main worktree ('util' is NULL) above
162 * linked worktrees ('util' not NULL) since main worktree can't be
163 * removed
164 */
165 if (!x->util)
166 return -1;
167 if (!y->util)
168 return 1;
4a3ce479
ES
169 /* paths same; sort by .git/worktrees/<id> */
170 return strcmp(x->util, y->util);
171}
172
173static void prune_dups(struct string_list *l)
174{
175 int i;
176
177 QSORT(l->items, l->nr, prune_cmp);
178 for (i = 1; i < l->nr; i++) {
179 if (!fspathcmp(l->items[i].string, l->items[i - 1].string))
180 prune_worktree(l->items[i].util, "duplicate entry");
181 }
182}
183
df0b6cfb
NTND
184static void prune_worktrees(void)
185{
186 struct strbuf reason = STRBUF_INIT;
916133ef 187 struct strbuf main_path = STRBUF_INIT;
4a3ce479 188 struct string_list kept = STRING_LIST_INIT_NODUP;
df0b6cfb
NTND
189 DIR *dir = opendir(git_path("worktrees"));
190 struct dirent *d;
df0b6cfb
NTND
191 if (!dir)
192 return;
193 while ((d = readdir(dir)) != NULL) {
4a3ce479 194 char *path;
afb9e30b 195 if (is_dot_or_dotdot(d->d_name))
df0b6cfb
NTND
196 continue;
197 strbuf_reset(&reason);
4a3ce479
ES
198 if (should_prune_worktree(d->d_name, &reason, &path))
199 prune_worktree(d->d_name, reason.buf);
200 else if (path)
201 string_list_append(&kept, path)->util = xstrdup(d->d_name);
df0b6cfb
NTND
202 }
203 closedir(dir);
4a3ce479 204
916133ef
ES
205 strbuf_add_absolute_path(&main_path, get_git_common_dir());
206 /* massage main worktree absolute path to match 'gitdir' content */
207 strbuf_strip_suffix(&main_path, "/.");
208 string_list_append(&kept, strbuf_detach(&main_path, NULL));
4a3ce479
ES
209 prune_dups(&kept);
210 string_list_clear(&kept, 1);
211
df0b6cfb 212 if (!show_only)
3a540433 213 delete_worktrees_dir_if_empty();
df0b6cfb 214 strbuf_release(&reason);
df0b6cfb
NTND
215}
216
217static int prune(int ac, const char **av, const char *prefix)
218{
219 struct option options[] = {
220 OPT__DRY_RUN(&show_only, N_("do not remove, show only")),
2488dcab 221 OPT__VERBOSE(&verbose, N_("report pruned working trees")),
df0b6cfb 222 OPT_EXPIRY_DATE(0, "expire", &expire,
2488dcab 223 N_("expire working trees older than <time>")),
df0b6cfb
NTND
224 OPT_END()
225 };
226
dddbad72 227 expire = TIME_MAX;
df0b6cfb
NTND
228 ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
229 if (ac)
230 usage_with_options(worktree_usage, options);
231 prune_worktrees();
232 return 0;
233}
234
b979d950
ES
235static char *junk_work_tree;
236static char *junk_git_dir;
237static int is_junk;
238static pid_t junk_pid;
239
240static void remove_junk(void)
241{
242 struct strbuf sb = STRBUF_INIT;
243 if (!is_junk || getpid() != junk_pid)
244 return;
245 if (junk_git_dir) {
246 strbuf_addstr(&sb, junk_git_dir);
247 remove_dir_recursively(&sb, 0);
248 strbuf_reset(&sb);
249 }
250 if (junk_work_tree) {
251 strbuf_addstr(&sb, junk_work_tree);
252 remove_dir_recursively(&sb, 0);
253 }
254 strbuf_release(&sb);
255}
256
257static void remove_junk_on_signal(int signo)
258{
259 remove_junk();
260 sigchain_pop(signo);
261 raise(signo);
262}
263
f5682b2a
ES
264static const char *worktree_basename(const char *path, int *olen)
265{
266 const char *name;
267 int len;
268
269 len = strlen(path);
270 while (len && is_dir_sep(path[len - 1]))
271 len--;
272
273 for (name = path + len - 1; name > path; name--)
274 if (is_dir_sep(*name)) {
275 name++;
276 break;
277 }
278
279 *olen = len;
280 return name;
281}
282
d179af67
ES
283/* check that path is viable location for worktree */
284static void check_candidate_path(const char *path,
285 int force,
286 struct worktree **worktrees,
287 const char *cmd)
45059e64 288{
cb56f55c
ES
289 struct worktree *wt;
290 int locked;
291
45059e64
ES
292 if (file_exists(path) && !is_empty_dir(path))
293 die(_("'%s' already exists"), path);
cb56f55c 294
bb69b3b0 295 wt = find_worktree_by_path(worktrees, path);
cb56f55c 296 if (!wt)
d179af67 297 return;
cb56f55c 298
d236f12b 299 locked = !!worktree_lock_reason(wt);
d179af67 300 if ((!locked && force) || (locked && force > 1)) {
e19831c9 301 if (delete_git_dir(wt->id))
d179af67
ES
302 die(_("unusable worktree destination '%s'"), path);
303 return;
e19831c9
ES
304 }
305
cb56f55c 306 if (locked)
d179af67 307 die(_("'%s' is a missing but locked worktree;\nuse '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"), cmd, path);
cb56f55c 308 else
d179af67 309 die(_("'%s' is a missing but already registered worktree;\nuse '%s -f' to override, or 'prune' or 'remove' to clear"), cmd, path);
45059e64
ES
310}
311
80a0548f 312static int add_worktree(const char *path, const char *refname,
5dd6e234 313 const struct add_opts *opts)
b979d950
ES
314{
315 struct strbuf sb_git = STRBUF_INIT, sb_repo = STRBUF_INIT;
316 struct strbuf sb = STRBUF_INIT;
317 const char *name;
542aa25d 318 struct child_process cp = CHILD_PROCESS_INIT;
ae2a3827 319 struct argv_array child_env = ARGV_ARRAY_INIT;
7af01f23
MS
320 unsigned int counter = 0;
321 int len, ret;
f7c9dac1
ES
322 struct strbuf symref = STRBUF_INIT;
323 struct commit *commit = NULL;
ade546be 324 int is_branch = 0;
1de16aec 325 struct strbuf sb_name = STRBUF_INIT;
d179af67 326 struct worktree **worktrees;
b979d950 327
d179af67
ES
328 worktrees = get_worktrees(0);
329 check_candidate_path(path, opts->force, worktrees, "add");
330 free_worktrees(worktrees);
331 worktrees = NULL;
b979d950 332
f7c9dac1 333 /* is 'refname' a branch or commit? */
0ebf4a2a 334 if (!opts->detach && !strbuf_check_branch_ref(&symref, refname) &&
ade546be
ES
335 ref_exists(symref.buf)) {
336 is_branch = 1;
f7c9dac1 337 if (!opts->force)
8d9fdd70 338 die_if_checked_out(symref.buf, 0);
f7c9dac1 339 }
ade546be
ES
340 commit = lookup_commit_reference_by_name(refname);
341 if (!commit)
342 die(_("invalid reference: %s"), refname);
f7c9dac1 343
f5682b2a 344 name = worktree_basename(path, &len);
1de16aec
NTND
345 strbuf_add(&sb, name, path + len - name);
346 sanitize_refname_component(sb.buf, &sb_name);
347 if (!sb_name.len)
348 BUG("How come '%s' becomes empty after sanitization?", sb.buf);
349 strbuf_reset(&sb);
350 name = sb_name.buf;
351 git_path_buf(&sb_repo, "worktrees/%s", name);
b979d950
ES
352 len = sb_repo.len;
353 if (safe_create_leading_directories_const(sb_repo.buf))
354 die_errno(_("could not create leading directories of '%s'"),
355 sb_repo.buf);
7af01f23
MS
356
357 while (mkdir(sb_repo.buf, 0777)) {
b979d950 358 counter++;
7af01f23
MS
359 if ((errno != EEXIST) || !counter /* overflow */)
360 die_errno(_("could not create directory of '%s'"),
361 sb_repo.buf);
b979d950
ES
362 strbuf_setlen(&sb_repo, len);
363 strbuf_addf(&sb_repo, "%d", counter);
364 }
365 name = strrchr(sb_repo.buf, '/') + 1;
366
367 junk_pid = getpid();
368 atexit(remove_junk);
369 sigchain_push_common(remove_junk_on_signal);
370
b979d950
ES
371 junk_git_dir = xstrdup(sb_repo.buf);
372 is_junk = 1;
373
374 /*
375 * lock the incomplete repo so prune won't delete it, unlock
376 * after the preparation is over.
377 */
378 strbuf_addf(&sb, "%s/locked", sb_repo.buf);
507e6e9e
NTND
379 if (!opts->keep_locked)
380 write_file(sb.buf, "initializing");
381 else
382 write_file(sb.buf, "added with --lock");
b979d950
ES
383
384 strbuf_addf(&sb_git, "%s/.git", path);
385 if (safe_create_leading_directories_const(sb_git.buf))
386 die_errno(_("could not create leading directories of '%s'"),
387 sb_git.buf);
388 junk_work_tree = xstrdup(path);
389
390 strbuf_reset(&sb);
391 strbuf_addf(&sb, "%s/gitdir", sb_repo.buf);
1f76a10b
JH
392 write_file(sb.buf, "%s", real_path(sb_git.buf));
393 write_file(sb_git.buf, "gitdir: %s/worktrees/%s",
b979d950
ES
394 real_path(get_git_common_dir()), name);
395 /*
396 * This is to keep resolve_ref() happy. We need a valid HEAD
ed197a6a
ES
397 * or is_git_directory() will reject the directory. Any value which
398 * looks like an object ID will do since it will be immediately
399 * replaced by the symbolic-ref or update-ref invocation in the new
400 * worktree.
b979d950 401 */
b979d950
ES
402 strbuf_reset(&sb);
403 strbuf_addf(&sb, "%s/HEAD", sb_repo.buf);
f6ca67d6 404 write_file(sb.buf, "%s", oid_to_hex(&null_oid));
b979d950
ES
405 strbuf_reset(&sb);
406 strbuf_addf(&sb, "%s/commondir", sb_repo.buf);
1f76a10b 407 write_file(sb.buf, "../..");
b979d950 408
ae2a3827
ES
409 argv_array_pushf(&child_env, "%s=%s", GIT_DIR_ENVIRONMENT, sb_git.buf);
410 argv_array_pushf(&child_env, "%s=%s", GIT_WORK_TREE_ENVIRONMENT, path);
b979d950 411 cp.git_cmd = 1;
7f44e3d1 412
ade546be 413 if (!is_branch)
7f44e3d1 414 argv_array_pushl(&cp.args, "update-ref", "HEAD",
f2fd0760 415 oid_to_hex(&commit->object.oid), NULL);
371979c2 416 else {
7f44e3d1
ES
417 argv_array_pushl(&cp.args, "symbolic-ref", "HEAD",
418 symref.buf, NULL);
371979c2
EP
419 if (opts->quiet)
420 argv_array_push(&cp.args, "--quiet");
421 }
422
7f44e3d1
ES
423 cp.env = child_env.argv;
424 ret = run_command(&cp);
425 if (ret)
426 goto done;
427
ef2a0ac9
RZ
428 if (opts->checkout) {
429 cp.argv = NULL;
430 argv_array_clear(&cp.args);
4782cf2a 431 argv_array_pushl(&cp.args, "reset", "--hard", "--no-recurse-submodules", NULL);
371979c2
EP
432 if (opts->quiet)
433 argv_array_push(&cp.args, "--quiet");
ef2a0ac9
RZ
434 cp.env = child_env.argv;
435 ret = run_command(&cp);
436 if (ret)
437 goto done;
b979d950 438 }
ef2a0ac9
RZ
439
440 is_junk = 0;
88ce3ef6
ÆAB
441 FREE_AND_NULL(junk_work_tree);
442 FREE_AND_NULL(junk_git_dir);
ef2a0ac9 443
7f44e3d1 444done:
507e6e9e
NTND
445 if (ret || !opts->keep_locked) {
446 strbuf_reset(&sb);
447 strbuf_addf(&sb, "%s/locked", sb_repo.buf);
448 unlink_or_warn(sb.buf);
449 }
ade546be
ES
450
451 /*
452 * Hook failure does not warrant worktree deletion, so run hook after
453 * is_junk is cleared, but do return appropriate code when hook fails.
454 */
a4bf1e3c
ES
455 if (!ret && opts->checkout) {
456 const char *hook = find_hook("post-checkout");
457 if (hook) {
458 const char *env[] = { "GIT_DIR", "GIT_WORK_TREE", NULL };
459 cp.git_cmd = 0;
460 cp.no_stdin = 1;
461 cp.stdout_to_stderr = 1;
462 cp.dir = path;
463 cp.env = env;
464 cp.argv = NULL;
6206286e 465 cp.trace2_hook_name = "post-checkout";
a4bf1e3c
ES
466 argv_array_pushl(&cp.args, absolute_path(hook),
467 oid_to_hex(&null_oid),
468 oid_to_hex(&commit->object.oid),
469 "1", NULL);
470 ret = run_command(&cp);
471 }
472 }
ade546be 473
ae2a3827 474 argv_array_clear(&child_env);
b979d950 475 strbuf_release(&sb);
f7c9dac1 476 strbuf_release(&symref);
b979d950
ES
477 strbuf_release(&sb_repo);
478 strbuf_release(&sb_git);
1de16aec 479 strbuf_release(&sb_name);
b979d950
ES
480 return ret;
481}
482
2c27002a
TG
483static void print_preparing_worktree_line(int detach,
484 const char *branch,
485 const char *new_branch,
486 int force_new_branch)
487{
488 if (force_new_branch) {
489 struct commit *commit = lookup_commit_reference_by_name(new_branch);
490 if (!commit)
491 printf_ln(_("Preparing worktree (new branch '%s')"), new_branch);
492 else
493 printf_ln(_("Preparing worktree (resetting branch '%s'; was at %s)"),
494 new_branch,
10174da9 495 find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV));
2c27002a
TG
496 } else if (new_branch) {
497 printf_ln(_("Preparing worktree (new branch '%s')"), new_branch);
498 } else {
499 struct strbuf s = STRBUF_INIT;
500 if (!detach && !strbuf_check_branch_ref(&s, branch) &&
501 ref_exists(s.buf))
502 printf_ln(_("Preparing worktree (checking out '%s')"),
503 branch);
504 else {
505 struct commit *commit = lookup_commit_reference_by_name(branch);
506 if (!commit)
507 die(_("invalid reference: %s"), branch);
508 printf_ln(_("Preparing worktree (detached HEAD %s)"),
10174da9 509 find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV));
2c27002a
TG
510 }
511 strbuf_release(&s);
512 }
513}
514
6427f871
TG
515static const char *dwim_branch(const char *path, const char **new_branch)
516{
517 int n;
518 const char *s = worktree_basename(path, &n);
f60a7b76
TG
519 const char *branchname = xstrndup(s, n);
520 struct strbuf ref = STRBUF_INIT;
521
522 UNLEAK(branchname);
523 if (!strbuf_check_branch_ref(&ref, branchname) &&
524 ref_exists(ref.buf)) {
525 strbuf_release(&ref);
526 return branchname;
527 }
528
529 *new_branch = branchname;
6427f871
TG
530 if (guess_remote) {
531 struct object_id oid;
532 const char *remote =
3c87aa94 533 unique_tracking_name(*new_branch, &oid, NULL);
6427f871
TG
534 return remote;
535 }
536 return NULL;
537}
538
fc56361f
ES
539static int add(int ac, const char **av, const char *prefix)
540{
5dd6e234
ES
541 struct add_opts opts;
542 const char *new_branch_force = NULL;
e4da43b1
JK
543 char *path;
544 const char *branch;
d861d34a 545 const char *new_branch = NULL;
e284e892 546 const char *opt_track = NULL;
fc56361f 547 struct option options[] = {
1224781d
NTND
548 OPT__FORCE(&opts.force,
549 N_("checkout <branch> even if already checked out in other worktree"),
fc3d4e0c 550 PARSE_OPT_NOCOMPLETE),
d861d34a 551 OPT_STRING('b', NULL, &new_branch, N_("branch"),
cbdf60fa
ES
552 N_("create a new branch")),
553 OPT_STRING('B', NULL, &new_branch_force, N_("branch"),
554 N_("create or reset a branch")),
5dd6e234 555 OPT_BOOL(0, "detach", &opts.detach, N_("detach HEAD at named commit")),
ef2a0ac9 556 OPT_BOOL(0, "checkout", &opts.checkout, N_("populate the new working tree")),
507e6e9e 557 OPT_BOOL(0, "lock", &opts.keep_locked, N_("keep the new working tree locked")),
371979c2 558 OPT__QUIET(&opts.quiet, N_("suppress progress reporting")),
e284e892
TG
559 OPT_PASSTHRU(0, "track", &opt_track, NULL,
560 N_("set up tracking mode (see git-branch(1))"),
561 PARSE_OPT_NOARG | PARSE_OPT_OPTARG),
71d6682d
TG
562 OPT_BOOL(0, "guess-remote", &guess_remote,
563 N_("try to match the new branch name with a remote-tracking branch")),
fc56361f
ES
564 OPT_END()
565 };
566
5dd6e234 567 memset(&opts, 0, sizeof(opts));
ef2a0ac9 568 opts.checkout = 1;
fc56361f 569 ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
d861d34a 570 if (!!opts.detach + !!new_branch + !!new_branch_force > 1)
ab0b2c53 571 die(_("-b, -B, and --detach are mutually exclusive"));
0f4af3b9
ES
572 if (ac < 1 || ac > 2)
573 usage_with_options(worktree_usage, options);
fc56361f 574
116fb64e 575 path = prefix_filename(prefix, av[0]);
0f4af3b9 576 branch = ac < 2 ? "HEAD" : av[1];
fc56361f 577
1a450e2f
JDG
578 if (!strcmp(branch, "-"))
579 branch = "@{-1}";
580
d861d34a 581 if (new_branch_force) {
beb6f24b
NTND
582 struct strbuf symref = STRBUF_INIT;
583
d861d34a 584 new_branch = new_branch_force;
eef005dc 585
beb6f24b 586 if (!opts.force &&
d861d34a 587 !strbuf_check_branch_ref(&symref, new_branch) &&
beb6f24b 588 ref_exists(symref.buf))
8d9fdd70 589 die_if_checked_out(symref.buf, 0);
beb6f24b
NTND
590 strbuf_release(&symref);
591 }
592
d861d34a 593 if (ac < 2 && !new_branch && !opts.detach) {
6427f871
TG
594 const char *s = dwim_branch(path, &new_branch);
595 if (s)
596 branch = s;
1eb07d82
ES
597 }
598
d861d34a 599 if (ac == 2 && !new_branch && !opts.detach) {
4e853331
TG
600 struct object_id oid;
601 struct commit *commit;
602 const char *remote;
603
604 commit = lookup_commit_reference_by_name(branch);
605 if (!commit) {
3c87aa94 606 remote = unique_tracking_name(branch, &oid, NULL);
4e853331 607 if (remote) {
d861d34a 608 new_branch = branch;
4e853331
TG
609 branch = remote;
610 }
611 }
612 }
371979c2
EP
613 if (!opts.quiet)
614 print_preparing_worktree_line(opts.detach, branch, new_branch, !!new_branch_force);
2c27002a 615
d861d34a 616 if (new_branch) {
542aa25d 617 struct child_process cp = CHILD_PROCESS_INIT;
c2842439
ES
618 cp.git_cmd = 1;
619 argv_array_push(&cp.args, "branch");
d861d34a 620 if (new_branch_force)
c2842439 621 argv_array_push(&cp.args, "--force");
371979c2
EP
622 if (opts.quiet)
623 argv_array_push(&cp.args, "--quiet");
d861d34a 624 argv_array_push(&cp.args, new_branch);
c2842439 625 argv_array_push(&cp.args, branch);
e284e892
TG
626 if (opt_track)
627 argv_array_push(&cp.args, opt_track);
c2842439
ES
628 if (run_command(&cp))
629 return -1;
d861d34a 630 branch = new_branch;
e284e892
TG
631 } else if (opt_track) {
632 die(_("--[no-]track can only be used if a new branch is created"));
1eb07d82
ES
633 }
634
0e5bba53
JK
635 UNLEAK(path);
636 UNLEAK(opts);
80a0548f 637 return add_worktree(path, branch, &opts);
fc56361f
ES
638}
639
bb9c03b8
MR
640static void show_worktree_porcelain(struct worktree *wt)
641{
642 printf("worktree %s\n", wt->path);
643 if (wt->is_bare)
644 printf("bare\n");
645 else {
0f05154c 646 printf("HEAD %s\n", oid_to_hex(&wt->head_oid));
bb9c03b8
MR
647 if (wt->is_detached)
648 printf("detached\n");
a234563a 649 else if (wt->head_ref)
bb9c03b8
MR
650 printf("branch %s\n", wt->head_ref);
651 }
652 printf("\n");
653}
654
655static void show_worktree(struct worktree *wt, int path_maxlen, int abbrev_len)
656{
657 struct strbuf sb = STRBUF_INIT;
658 int cur_path_len = strlen(wt->path);
659 int path_adj = cur_path_len - utf8_strwidth(wt->path);
660
661 strbuf_addf(&sb, "%-*s ", 1 + path_maxlen + path_adj, wt->path);
662 if (wt->is_bare)
663 strbuf_addstr(&sb, "(bare)");
664 else {
665 strbuf_addf(&sb, "%-*s ", abbrev_len,
aab9583f 666 find_unique_abbrev(&wt->head_oid, DEFAULT_ABBREV));
96f09e2a 667 if (wt->is_detached)
bb9c03b8 668 strbuf_addstr(&sb, "(detached HEAD)");
2e11f58f
JS
669 else if (wt->head_ref) {
670 char *ref = shorten_unambiguous_ref(wt->head_ref, 0);
671 strbuf_addf(&sb, "[%s]", ref);
672 free(ref);
673 } else
a234563a 674 strbuf_addstr(&sb, "(error)");
bb9c03b8
MR
675 }
676 printf("%s\n", sb.buf);
677
678 strbuf_release(&sb);
679}
680
681static void measure_widths(struct worktree **wt, int *abbrev, int *maxlen)
682{
683 int i;
684
685 for (i = 0; wt[i]; i++) {
686 int sha1_len;
687 int path_len = strlen(wt[i]->path);
688
689 if (path_len > *maxlen)
690 *maxlen = path_len;
aab9583f 691 sha1_len = strlen(find_unique_abbrev(&wt[i]->head_oid, *abbrev));
bb9c03b8
MR
692 if (sha1_len > *abbrev)
693 *abbrev = sha1_len;
694 }
695}
696
697static int list(int ac, const char **av, const char *prefix)
698{
699 int porcelain = 0;
700
701 struct option options[] = {
702 OPT_BOOL(0, "porcelain", &porcelain, N_("machine-readable output")),
703 OPT_END()
704 };
705
706 ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
707 if (ac)
708 usage_with_options(worktree_usage, options);
709 else {
4df1d4d4 710 struct worktree **worktrees = get_worktrees(GWT_SORT_LINKED);
bb9c03b8
MR
711 int path_maxlen = 0, abbrev = DEFAULT_ABBREV, i;
712
713 if (!porcelain)
714 measure_widths(worktrees, &abbrev, &path_maxlen);
715
716 for (i = 0; worktrees[i]; i++) {
717 if (porcelain)
718 show_worktree_porcelain(worktrees[i]);
719 else
720 show_worktree(worktrees[i], path_maxlen, abbrev);
721 }
722 free_worktrees(worktrees);
723 }
724 return 0;
725}
726
58142c09
NTND
727static int lock_worktree(int ac, const char **av, const char *prefix)
728{
729 const char *reason = "", *old_reason;
730 struct option options[] = {
731 OPT_STRING(0, "reason", &reason, N_("string"),
732 N_("reason for locking")),
733 OPT_END()
734 };
735 struct worktree **worktrees, *wt;
736
737 ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
738 if (ac != 1)
739 usage_with_options(worktree_usage, options);
740
4fff1ef7 741 worktrees = get_worktrees(0);
58142c09
NTND
742 wt = find_worktree(worktrees, prefix, av[0]);
743 if (!wt)
744 die(_("'%s' is not a working tree"), av[0]);
745 if (is_main_worktree(wt))
746 die(_("The main working tree cannot be locked or unlocked"));
747
d236f12b 748 old_reason = worktree_lock_reason(wt);
58142c09
NTND
749 if (old_reason) {
750 if (*old_reason)
751 die(_("'%s' is already locked, reason: %s"),
752 av[0], old_reason);
753 die(_("'%s' is already locked"), av[0]);
754 }
755
756 write_file(git_common_path("worktrees/%s/locked", wt->id),
757 "%s", reason);
758 free_worktrees(worktrees);
759 return 0;
760}
761
6d308627
NTND
762static int unlock_worktree(int ac, const char **av, const char *prefix)
763{
764 struct option options[] = {
765 OPT_END()
766 };
767 struct worktree **worktrees, *wt;
768 int ret;
769
770 ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
771 if (ac != 1)
772 usage_with_options(worktree_usage, options);
773
4fff1ef7 774 worktrees = get_worktrees(0);
6d308627
NTND
775 wt = find_worktree(worktrees, prefix, av[0]);
776 if (!wt)
777 die(_("'%s' is not a working tree"), av[0]);
778 if (is_main_worktree(wt))
779 die(_("The main working tree cannot be locked or unlocked"));
d236f12b 780 if (!worktree_lock_reason(wt))
6d308627
NTND
781 die(_("'%s' is not locked"), av[0]);
782 ret = unlink_or_warn(git_common_path("worktrees/%s/locked", wt->id));
783 free_worktrees(worktrees);
784 return ret;
785}
786
78d986b2
NTND
787static void validate_no_submodules(const struct worktree *wt)
788{
789 struct index_state istate = { NULL };
00a6d4d1 790 struct strbuf path = STRBUF_INIT;
78d986b2
NTND
791 int i, found_submodules = 0;
792
00a6d4d1
NTND
793 if (is_directory(worktree_git_path(wt, "modules"))) {
794 /*
795 * There could be false positives, e.g. the "modules"
796 * directory exists but is empty. But it's a rare case and
797 * this simpler check is probably good enough for now.
798 */
799 found_submodules = 1;
800 } else if (read_index_from(&istate, worktree_git_path(wt, "index"),
801 get_worktree_git_dir(wt)) > 0) {
78d986b2
NTND
802 for (i = 0; i < istate.cache_nr; i++) {
803 struct cache_entry *ce = istate.cache[i];
00a6d4d1 804 int err;
78d986b2 805
00a6d4d1
NTND
806 if (!S_ISGITLINK(ce->ce_mode))
807 continue;
808
809 strbuf_reset(&path);
810 strbuf_addf(&path, "%s/%s", wt->path, ce->name);
811 if (!is_submodule_populated_gently(path.buf, &err))
812 continue;
813
814 found_submodules = 1;
815 break;
78d986b2
NTND
816 }
817 }
818 discard_index(&istate);
00a6d4d1 819 strbuf_release(&path);
78d986b2
NTND
820
821 if (found_submodules)
cc73385c 822 die(_("working trees containing submodules cannot be moved or removed"));
78d986b2
NTND
823}
824
9f792bb4
NTND
825static int move_worktree(int ac, const char **av, const char *prefix)
826{
68a6b3a1 827 int force = 0;
9f792bb4 828 struct option options[] = {
68a6b3a1
ES
829 OPT__FORCE(&force,
830 N_("force move even if worktree is dirty or locked"),
831 PARSE_OPT_NOCOMPLETE),
9f792bb4
NTND
832 OPT_END()
833 };
834 struct worktree **worktrees, *wt;
835 struct strbuf dst = STRBUF_INIT;
836 struct strbuf errmsg = STRBUF_INIT;
68a6b3a1 837 const char *reason = NULL;
9f792bb4
NTND
838 char *path;
839
840 ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
841 if (ac != 2)
842 usage_with_options(worktree_usage, options);
843
844 path = prefix_filename(prefix, av[1]);
845 strbuf_addstr(&dst, path);
846 free(path);
847
848 worktrees = get_worktrees(0);
849 wt = find_worktree(worktrees, prefix, av[0]);
850 if (!wt)
851 die(_("'%s' is not a working tree"), av[0]);
852 if (is_main_worktree(wt))
853 die(_("'%s' is a main working tree"), av[0]);
c64a8d20
NTND
854 if (is_directory(dst.buf)) {
855 const char *sep = find_last_dir_sep(wt->path);
856
857 if (!sep)
858 die(_("could not figure out destination name from '%s'"),
859 wt->path);
860 strbuf_trim_trailing_dir_sep(&dst);
861 strbuf_addstr(&dst, sep);
862 }
810382ed 863 check_candidate_path(dst.buf, force, worktrees, "move");
9f792bb4 864
78d986b2
NTND
865 validate_no_submodules(wt);
866
68a6b3a1 867 if (force < 2)
d236f12b 868 reason = worktree_lock_reason(wt);
9f792bb4
NTND
869 if (reason) {
870 if (*reason)
68a6b3a1 871 die(_("cannot move a locked working tree, lock reason: %s\nuse 'move -f -f' to override or unlock first"),
9f792bb4 872 reason);
68a6b3a1 873 die(_("cannot move a locked working tree;\nuse 'move -f -f' to override or unlock first"));
9f792bb4 874 }
ee6763af 875 if (validate_worktree(wt, &errmsg, 0))
9f792bb4
NTND
876 die(_("validation failed, cannot move working tree: %s"),
877 errmsg.buf);
878 strbuf_release(&errmsg);
879
880 if (rename(wt->path, dst.buf) == -1)
881 die_errno(_("failed to move '%s' to '%s'"), wt->path, dst.buf);
882
883 update_worktree_location(wt, dst.buf);
884
885 strbuf_release(&dst);
886 free_worktrees(worktrees);
887 return 0;
888}
889
cc73385c
NTND
890/*
891 * Note, "git status --porcelain" is used to determine if it's safe to
892 * delete a whole worktree. "git status" does not ignore user
893 * configuration, so if a normal "git status" shows "clean" for the
894 * user, then it's ok to remove it.
895 *
896 * This assumption may be a bad one. We may want to ignore
897 * (potentially bad) user settings and only delete a worktree when
898 * it's absolutely safe to do so from _our_ point of view because we
899 * know better.
900 */
901static void check_clean_worktree(struct worktree *wt,
902 const char *original_path)
903{
904 struct argv_array child_env = ARGV_ARRAY_INIT;
905 struct child_process cp;
906 char buf[1];
907 int ret;
908
909 /*
910 * Until we sort this out, all submodules are "dirty" and
911 * will abort this function.
912 */
913 validate_no_submodules(wt);
914
915 argv_array_pushf(&child_env, "%s=%s/.git",
916 GIT_DIR_ENVIRONMENT, wt->path);
917 argv_array_pushf(&child_env, "%s=%s",
918 GIT_WORK_TREE_ENVIRONMENT, wt->path);
919 memset(&cp, 0, sizeof(cp));
920 argv_array_pushl(&cp.args, "status",
921 "--porcelain", "--ignore-submodules=none",
922 NULL);
923 cp.env = child_env.argv;
924 cp.git_cmd = 1;
925 cp.dir = wt->path;
926 cp.out = -1;
927 ret = start_command(&cp);
928 if (ret)
929 die_errno(_("failed to run 'git status' on '%s'"),
930 original_path);
931 ret = xread(cp.out, buf, sizeof(buf));
932 if (ret)
507e5470 933 die(_("'%s' contains modified or untracked files, use --force to delete it"),
cc73385c
NTND
934 original_path);
935 close(cp.out);
936 ret = finish_command(&cp);
937 if (ret)
938 die_errno(_("failed to run 'git status' on '%s', code %d"),
939 original_path, ret);
940}
941
942static int delete_git_work_tree(struct worktree *wt)
943{
944 struct strbuf sb = STRBUF_INIT;
945 int ret = 0;
946
947 strbuf_addstr(&sb, wt->path);
948 if (remove_dir_recursively(&sb, 0)) {
949 error_errno(_("failed to delete '%s'"), sb.buf);
950 ret = -1;
951 }
952 strbuf_release(&sb);
953 return ret;
954}
955
cc73385c
NTND
956static int remove_worktree(int ac, const char **av, const char *prefix)
957{
958 int force = 0;
959 struct option options[] = {
d228eea5 960 OPT__FORCE(&force,
f4143101 961 N_("force removal even if worktree is dirty or locked"),
d228eea5 962 PARSE_OPT_NOCOMPLETE),
cc73385c
NTND
963 OPT_END()
964 };
965 struct worktree **worktrees, *wt;
966 struct strbuf errmsg = STRBUF_INIT;
f4143101 967 const char *reason = NULL;
cc73385c
NTND
968 int ret = 0;
969
970 ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
971 if (ac != 1)
972 usage_with_options(worktree_usage, options);
973
974 worktrees = get_worktrees(0);
975 wt = find_worktree(worktrees, prefix, av[0]);
976 if (!wt)
977 die(_("'%s' is not a working tree"), av[0]);
978 if (is_main_worktree(wt))
979 die(_("'%s' is a main working tree"), av[0]);
f4143101 980 if (force < 2)
d236f12b 981 reason = worktree_lock_reason(wt);
cc73385c
NTND
982 if (reason) {
983 if (*reason)
f4143101 984 die(_("cannot remove a locked working tree, lock reason: %s\nuse 'remove -f -f' to override or unlock first"),
cc73385c 985 reason);
f4143101 986 die(_("cannot remove a locked working tree;\nuse 'remove -f -f' to override or unlock first"));
cc73385c 987 }
ee6763af 988 if (validate_worktree(wt, &errmsg, WT_VALIDATE_WORKTREE_MISSING_OK))
cc73385c
NTND
989 die(_("validation failed, cannot remove working tree: %s"),
990 errmsg.buf);
991 strbuf_release(&errmsg);
992
ee6763af
NTND
993 if (file_exists(wt->path)) {
994 if (!force)
995 check_clean_worktree(wt, av[0]);
cc73385c 996
ee6763af
NTND
997 ret |= delete_git_work_tree(wt);
998 }
cc73385c
NTND
999 /*
1000 * continue on even if ret is non-zero, there's no going back
1001 * from here.
1002 */
602aaed0 1003 ret |= delete_git_dir(wt->id);
3a540433 1004 delete_worktrees_dir_if_empty();
cc73385c
NTND
1005
1006 free_worktrees(worktrees);
1007 return ret;
1008}
1009
df0b6cfb
NTND
1010int cmd_worktree(int ac, const char **av, const char *prefix)
1011{
1012 struct option options[] = {
1013 OPT_END()
1014 };
1015
e92445a7 1016 git_config(git_worktree_config, NULL);
d49028e6 1017
df0b6cfb
NTND
1018 if (ac < 2)
1019 usage_with_options(worktree_usage, options);
0409e0b6
NTND
1020 if (!prefix)
1021 prefix = "";
fc56361f
ES
1022 if (!strcmp(av[1], "add"))
1023 return add(ac - 1, av + 1, prefix);
df0b6cfb
NTND
1024 if (!strcmp(av[1], "prune"))
1025 return prune(ac - 1, av + 1, prefix);
bb9c03b8
MR
1026 if (!strcmp(av[1], "list"))
1027 return list(ac - 1, av + 1, prefix);
58142c09
NTND
1028 if (!strcmp(av[1], "lock"))
1029 return lock_worktree(ac - 1, av + 1, prefix);
6d308627
NTND
1030 if (!strcmp(av[1], "unlock"))
1031 return unlock_worktree(ac - 1, av + 1, prefix);
9f792bb4
NTND
1032 if (!strcmp(av[1], "move"))
1033 return move_worktree(ac - 1, av + 1, prefix);
cc73385c
NTND
1034 if (!strcmp(av[1], "remove"))
1035 return remove_worktree(ac - 1, av + 1, prefix);
df0b6cfb
NTND
1036 usage_with_options(worktree_usage, options);
1037}