blob: 69132bba319e41d49e458a7dc5673f5bb0103df9 [file] [log] [blame]
Nguyễn Thái Ngọc Duydf0b6cf2015-06-29 19:51:18 +07001#include "cache.h"
Elijah Newren0b027f62023-03-21 06:25:58 +00002#include "abspath.h"
Thomas Gummerer4e853332017-11-26 19:43:54 +00003#include "checkout.h"
Brandon Williamsb2141fc2017-06-14 11:07:36 -07004#include "config.h"
Nguyễn Thái Ngọc Duydf0b6cf2015-06-29 19:51:18 +07005#include "builtin.h"
6#include "dir.h"
Elijah Newren32a8f512023-03-21 06:26:03 +00007#include "environment.h"
Elijah Newrenf394e092023-03-21 06:25:54 +00008#include "gettext.h"
Elijah Newren41771fa2023-02-24 00:09:27 +00009#include "hex.h"
Elijah Newrendabab1d2023-04-11 00:41:49 -070010#include "object-name.h"
Nguyễn Thái Ngọc Duydf0b6cf2015-06-29 19:51:18 +070011#include "parse-options.h"
Jeff Kingdbbcd442020-07-28 16:23:39 -040012#include "strvec.h"
Eric Sunshinef7c9dac2015-07-17 19:00:13 -040013#include "branch.h"
14#include "refs.h"
Eric Sunshinefc563612015-07-06 13:30:50 -040015#include "run-command.h"
Ævar Arnfjörð Bjarmason5e3aba32021-09-26 21:03:26 +020016#include "hook.h"
Eric Sunshineb979d952015-07-06 13:30:55 -040017#include "sigchain.h"
Nguyễn Thái Ngọc Duy00a6d4d2019-01-05 12:08:40 +070018#include "submodule.h"
Michael Rappazzobb9c03b2015-10-08 13:01:05 -040019#include "utf8.h"
20#include "worktree.h"
Elijah Newrend5ebb502023-03-21 06:26:01 +000021#include "wrapper.h"
Rafael Silva862c7232021-01-27 09:03:08 +010022#include "quote.h"
Nguyễn Thái Ngọc Duydf0b6cf2015-06-29 19:51:18 +070023
Ævar Arnfjörð Bjarmason0afd5562022-10-13 17:39:25 +020024#define BUILTIN_WORKTREE_ADD_USAGE \
Ævar Arnfjörð Bjarmason97f03a52022-10-13 17:39:26 +020025 N_("git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n" \
26 " [-b <new-branch>] <path> [<commit-ish>]")
Ævar Arnfjörð Bjarmason0afd5562022-10-13 17:39:25 +020027#define BUILTIN_WORKTREE_LIST_USAGE \
Ævar Arnfjörð Bjarmason97f03a52022-10-13 17:39:26 +020028 N_("git worktree list [-v | --porcelain [-z]]")
Ævar Arnfjörð Bjarmason0afd5562022-10-13 17:39:25 +020029#define BUILTIN_WORKTREE_LOCK_USAGE \
Ævar Arnfjörð Bjarmason97f03a52022-10-13 17:39:26 +020030 N_("git worktree lock [--reason <string>] <worktree>")
Ævar Arnfjörð Bjarmason0afd5562022-10-13 17:39:25 +020031#define BUILTIN_WORKTREE_MOVE_USAGE \
32 N_("git worktree move <worktree> <new-path>")
33#define BUILTIN_WORKTREE_PRUNE_USAGE \
Ævar Arnfjörð Bjarmason97f03a52022-10-13 17:39:26 +020034 N_("git worktree prune [-n] [-v] [--expire <expire>]")
Ævar Arnfjörð Bjarmason0afd5562022-10-13 17:39:25 +020035#define BUILTIN_WORKTREE_REMOVE_USAGE \
Ævar Arnfjörð Bjarmason97f03a52022-10-13 17:39:26 +020036 N_("git worktree remove [-f] <worktree>")
Ævar Arnfjörð Bjarmason0afd5562022-10-13 17:39:25 +020037#define BUILTIN_WORKTREE_REPAIR_USAGE \
38 N_("git worktree repair [<path>...]")
39#define BUILTIN_WORKTREE_UNLOCK_USAGE \
40 N_("git worktree unlock <worktree>")
41
42static 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
54static const char * const git_worktree_add_usage[] = {
55 BUILTIN_WORKTREE_ADD_USAGE,
56 NULL,
57};
58
59static const char * const git_worktree_list_usage[] = {
60 BUILTIN_WORKTREE_LIST_USAGE,
61 NULL
62};
63
64static const char * const git_worktree_lock_usage[] = {
65 BUILTIN_WORKTREE_LOCK_USAGE,
66 NULL
67};
68
69static const char * const git_worktree_move_usage[] = {
70 BUILTIN_WORKTREE_MOVE_USAGE,
71 NULL
72};
73
74static const char * const git_worktree_prune_usage[] = {
75 BUILTIN_WORKTREE_PRUNE_USAGE,
76 NULL
77};
78
79static const char * const git_worktree_remove_usage[] = {
80 BUILTIN_WORKTREE_REMOVE_USAGE,
81 NULL
82};
83
84static const char * const git_worktree_repair_usage[] = {
85 BUILTIN_WORKTREE_REPAIR_USAGE,
86 NULL
87};
88
89static const char * const git_worktree_unlock_usage[] = {
90 BUILTIN_WORKTREE_UNLOCK_USAGE,
Nguyễn Thái Ngọc Duydf0b6cf2015-06-29 19:51:18 +070091 NULL
92};
93
Eric Sunshine5dd6e232015-07-17 19:00:07 -040094struct add_opts {
95 int force;
96 int detach;
Elia Pinto371979c2018-08-15 20:56:30 +000097 int quiet;
Ray Zhangef2a0ac2016-03-29 10:11:01 +000098 int checkout;
Stephen Manz0db49612021-07-15 02:32:30 +000099 const char *keep_locked;
Eric Sunshine5dd6e232015-07-17 19:00:07 -0400100};
101
Nguyễn Thái Ngọc Duydf0b6cf2015-06-29 19:51:18 +0700102static int show_only;
103static int verbose;
Thomas Gummerere92445a2017-11-29 20:04:51 +0000104static int guess_remote;
Johannes Schindelindddbad72017-04-26 21:29:31 +0200105static timestamp_t expire;
Nguyễn Thái Ngọc Duydf0b6cf2015-06-29 19:51:18 +0700106
Thomas Gummerere92445a2017-11-29 20:04:51 +0000107static 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
Eric Sunshine602aaed2018-08-28 17:20:20 -0400117static int delete_git_dir(const char *id)
Eric Sunshinee5353be2018-08-28 17:20:19 -0400118{
119 struct strbuf sb = STRBUF_INIT;
Eric Sunshine602aaed2018-08-28 17:20:20 -0400120 int ret;
Eric Sunshinee5353be2018-08-28 17:20:19 -0400121
Eric Sunshine602aaed2018-08-28 17:20:20 -0400122 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)
Eric Sunshinee5353be2018-08-28 17:20:19 -0400127 error_errno(_("failed to delete '%s'"), sb.buf);
Eric Sunshinee5353be2018-08-28 17:20:19 -0400128 strbuf_release(&sb);
129 return ret;
130}
131
Eric Sunshine3a540432018-08-28 17:20:26 -0400132static void delete_worktrees_dir_if_empty(void)
133{
134 rmdir(git_path("worktrees")); /* ignore failed removal */
135}
136
Eric Sunshinedd9609a2020-06-10 02:30:45 -0400137static void prune_worktree(const char *id, const char *reason)
138{
139 if (show_only || verbose)
Eric Sunshineda8fb6b2021-12-02 22:44:19 -0500140 fprintf_ln(stderr, _("Removing %s/%s: %s"), "worktrees", id, reason);
Eric Sunshinedd9609a2020-06-10 02:30:45 -0400141 if (!show_only)
142 delete_git_dir(id);
143}
144
Eric Sunshine4a3ce472020-06-10 02:30:46 -0400145static 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;
Eric Sunshine916133e2020-06-10 02:30:47 -0400153 /*
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;
Eric Sunshine4a3ce472020-06-10 02:30:46 -0400163 /* paths same; sort by .git/worktrees/<id> */
164 return strcmp(x->util, y->util);
165}
166
167static 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
Nguyễn Thái Ngọc Duydf0b6cf2015-06-29 19:51:18 +0700178static void prune_worktrees(void)
179{
180 struct strbuf reason = STRBUF_INIT;
Eric Sunshine916133e2020-06-10 02:30:47 -0400181 struct strbuf main_path = STRBUF_INIT;
Ævar Arnfjörð Bjarmason9f24f3c2023-02-07 00:07:43 +0100182 struct string_list kept = STRING_LIST_INIT_DUP;
Nguyễn Thái Ngọc Duydf0b6cf2015-06-29 19:51:18 +0700183 DIR *dir = opendir(git_path("worktrees"));
184 struct dirent *d;
Nguyễn Thái Ngọc Duydf0b6cf2015-06-29 19:51:18 +0700185 if (!dir)
186 return;
Elijah Newrenb548f0f2021-05-12 17:28:22 +0000187 while ((d = readdir_skip_dot_and_dotdot(dir)) != NULL) {
Eric Sunshine4a3ce472020-06-10 02:30:46 -0400188 char *path;
Nguyễn Thái Ngọc Duydf0b6cf2015-06-29 19:51:18 +0700189 strbuf_reset(&reason);
Rafael Silvaa29a8b72021-01-19 22:27:33 +0100190 if (should_prune_worktree(d->d_name, &reason, &path, expire))
Eric Sunshine4a3ce472020-06-10 02:30:46 -0400191 prune_worktree(d->d_name, reason.buf);
192 else if (path)
Ævar Arnfjörð Bjarmason9f24f3c2023-02-07 00:07:43 +0100193 string_list_append_nodup(&kept, path)->util = xstrdup(d->d_name);
Nguyễn Thái Ngọc Duydf0b6cf2015-06-29 19:51:18 +0700194 }
195 closedir(dir);
Eric Sunshine4a3ce472020-06-10 02:30:46 -0400196
Eric Sunshine916133e2020-06-10 02:30:47 -0400197 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, "/.");
Ævar Arnfjörð Bjarmason9f24f3c2023-02-07 00:07:43 +0100200 string_list_append_nodup(&kept, strbuf_detach(&main_path, NULL));
Eric Sunshine4a3ce472020-06-10 02:30:46 -0400201 prune_dups(&kept);
202 string_list_clear(&kept, 1);
203
Nguyễn Thái Ngọc Duydf0b6cf2015-06-29 19:51:18 +0700204 if (!show_only)
Eric Sunshine3a540432018-08-28 17:20:26 -0400205 delete_worktrees_dir_if_empty();
Nguyễn Thái Ngọc Duydf0b6cf2015-06-29 19:51:18 +0700206 strbuf_release(&reason);
Nguyễn Thái Ngọc Duydf0b6cf2015-06-29 19:51:18 +0700207}
208
209static 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")),
Patrick Steinhardt2488dca2017-02-06 14:13:59 +0100213 OPT__VERBOSE(&verbose, N_("report pruned working trees")),
Nguyễn Thái Ngọc Duydf0b6cf2015-06-29 19:51:18 +0700214 OPT_EXPIRY_DATE(0, "expire", &expire,
Patrick Steinhardt2488dca2017-02-06 14:13:59 +0100215 N_("expire working trees older than <time>")),
Nguyễn Thái Ngọc Duydf0b6cf2015-06-29 19:51:18 +0700216 OPT_END()
217 };
218
Johannes Schindelindddbad72017-04-26 21:29:31 +0200219 expire = TIME_MAX;
Ævar Arnfjörð Bjarmason0afd5562022-10-13 17:39:25 +0200220 ac = parse_options(ac, av, prefix, options, git_worktree_prune_usage,
221 0);
Nguyễn Thái Ngọc Duydf0b6cf2015-06-29 19:51:18 +0700222 if (ac)
Ævar Arnfjörð Bjarmason0afd5562022-10-13 17:39:25 +0200223 usage_with_options(git_worktree_prune_usage, options);
Nguyễn Thái Ngọc Duydf0b6cf2015-06-29 19:51:18 +0700224 prune_worktrees();
225 return 0;
226}
227
Eric Sunshineb979d952015-07-06 13:30:55 -0400228static char *junk_work_tree;
229static char *junk_git_dir;
230static int is_junk;
231static pid_t junk_pid;
232
233static 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
250static void remove_junk_on_signal(int signo)
251{
252 remove_junk();
253 sigchain_pop(signo);
254 raise(signo);
255}
256
Eric Sunshinef5682b22015-07-06 13:30:57 -0400257static 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
Eric Sunshined179af62020-06-10 02:30:48 -0400276/* check that path is viable location for worktree */
277static void check_candidate_path(const char *path,
278 int force,
279 struct worktree **worktrees,
280 const char *cmd)
Eric Sunshine45059e62018-08-28 17:20:21 -0400281{
Eric Sunshinecb56f552018-08-28 17:20:22 -0400282 struct worktree *wt;
283 int locked;
284
Eric Sunshine45059e62018-08-28 17:20:21 -0400285 if (file_exists(path) && !is_empty_dir(path))
286 die(_("'%s' already exists"), path);
Eric Sunshinecb56f552018-08-28 17:20:22 -0400287
Eric Sunshinebb69b3b2020-02-24 04:08:48 -0500288 wt = find_worktree_by_path(worktrees, path);
Eric Sunshinecb56f552018-08-28 17:20:22 -0400289 if (!wt)
Eric Sunshined179af62020-06-10 02:30:48 -0400290 return;
Eric Sunshinecb56f552018-08-28 17:20:22 -0400291
Nickolai Belakovskid236f122018-10-29 23:24:09 -0700292 locked = !!worktree_lock_reason(wt);
Eric Sunshined179af62020-06-10 02:30:48 -0400293 if ((!locked && force) || (locked && force > 1)) {
Eric Sunshinee19831c2018-08-28 17:20:23 -0400294 if (delete_git_dir(wt->id))
Eric Sunshined179af62020-06-10 02:30:48 -0400295 die(_("unusable worktree destination '%s'"), path);
296 return;
Eric Sunshinee19831c2018-08-28 17:20:23 -0400297 }
298
Eric Sunshinecb56f552018-08-28 17:20:22 -0400299 if (locked)
Matheus Tavaresb86339b2020-11-20 12:09:39 -0300300 die(_("'%s' is a missing but locked worktree;\nuse '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"), path, cmd);
Eric Sunshinecb56f552018-08-28 17:20:22 -0400301 else
Matheus Tavaresb86339b2020-11-20 12:09:39 -0300302 die(_("'%s' is a missing but already registered worktree;\nuse '%s -f' to override, or 'prune' or 'remove' to clear"), path, cmd);
Eric Sunshine45059e62018-08-28 17:20:21 -0400303}
304
Derrick Stoleeace5ac52022-02-23 14:29:11 +0000305static 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
Derrick Stolee86397052022-02-23 14:29:10 +0000321static 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
356worktree_copy_cleanup:
357 free(from_file);
358 free(to_file);
359}
360
Derrick Stolee23f832e2022-02-23 14:29:12 +0000361static 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");
Ævar Arnfjörð Bjarmason29fda242022-06-02 11:09:50 +0200369 strvec_pushv(&cp.env, child_env->v);
Derrick Stolee23f832e2022-02-23 14:29:12 +0000370 return run_command(&cp);
371}
372
Eric Sunshine80a05482015-07-17 19:00:12 -0400373static int add_worktree(const char *path, const char *refname,
Eric Sunshine5dd6e232015-07-17 19:00:07 -0400374 const struct add_opts *opts)
Eric Sunshineb979d952015-07-06 13:30:55 -0400375{
376 struct strbuf sb_git = STRBUF_INIT, sb_repo = STRBUF_INIT;
Alexandr Miloslavskiy3d7747e2020-03-10 13:11:22 +0000377 struct strbuf sb = STRBUF_INIT, realpath = STRBUF_INIT;
Eric Sunshineb979d952015-07-06 13:30:55 -0400378 const char *name;
René Scharfe542aa252016-08-05 22:38:44 +0200379 struct child_process cp = CHILD_PROCESS_INIT;
Jeff King22f9b7f2020-07-28 16:24:27 -0400380 struct strvec child_env = STRVEC_INIT;
Michal Suchanek7af01f22019-02-20 17:16:48 +0100381 unsigned int counter = 0;
382 int len, ret;
Eric Sunshinef7c9dac2015-07-17 19:00:13 -0400383 struct strbuf symref = STRBUF_INIT;
384 struct commit *commit = NULL;
Eric Sunshineade546b2017-12-07 16:20:17 -0500385 int is_branch = 0;
Nguyễn Thái Ngọc Duy1de16ae2019-03-08 16:28:34 +0700386 struct strbuf sb_name = STRBUF_INIT;
Eric Sunshined179af62020-06-10 02:30:48 -0400387 struct worktree **worktrees;
Eric Sunshineb979d952015-07-06 13:30:55 -0400388
Eric Sunshine03f24652020-06-19 19:35:44 -0400389 worktrees = get_worktrees();
Eric Sunshined179af62020-06-10 02:30:48 -0400390 check_candidate_path(path, opts->force, worktrees, "add");
391 free_worktrees(worktrees);
392 worktrees = NULL;
Eric Sunshineb979d952015-07-06 13:30:55 -0400393
Eric Sunshinef7c9dac2015-07-17 19:00:13 -0400394 /* is 'refname' a branch or commit? */
Nguyễn Thái Ngọc Duy0ebf4a22016-02-15 20:35:32 +0700395 if (!opts->detach && !strbuf_check_branch_ref(&symref, refname) &&
Eric Sunshineade546b2017-12-07 16:20:17 -0500396 ref_exists(symref.buf)) {
397 is_branch = 1;
Eric Sunshinef7c9dac2015-07-17 19:00:13 -0400398 if (!opts->force)
Nguyễn Thái Ngọc Duy8d9fdd72016-04-22 20:01:33 +0700399 die_if_checked_out(symref.buf, 0);
Eric Sunshinef7c9dac2015-07-17 19:00:13 -0400400 }
Eric Sunshineade546b2017-12-07 16:20:17 -0500401 commit = lookup_commit_reference_by_name(refname);
402 if (!commit)
403 die(_("invalid reference: %s"), refname);
Eric Sunshinef7c9dac2015-07-17 19:00:13 -0400404
Eric Sunshinef5682b22015-07-06 13:30:57 -0400405 name = worktree_basename(path, &len);
Nguyễn Thái Ngọc Duy1de16ae2019-03-08 16:28:34 +0700406 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);
Eric Sunshineb979d952015-07-06 13:30:55 -0400413 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);
Michal Suchanek7af01f22019-02-20 17:16:48 +0100417
418 while (mkdir(sb_repo.buf, 0777)) {
Eric Sunshineb979d952015-07-06 13:30:55 -0400419 counter++;
Michal Suchanek7af01f22019-02-20 17:16:48 +0100420 if ((errno != EEXIST) || !counter /* overflow */)
421 die_errno(_("could not create directory of '%s'"),
422 sb_repo.buf);
Eric Sunshineb979d952015-07-06 13:30:55 -0400423 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
Eric Sunshineb979d952015-07-06 13:30:55 -0400432 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);
Stephen Manz0db49612021-07-15 02:32:30 +0000440 if (opts->keep_locked)
441 write_file(sb.buf, "%s", opts->keep_locked);
Nguyễn Thái Ngọc Duy507e6e92017-04-12 20:58:05 +0700442 else
Stephen Manz0db49612021-07-15 02:32:30 +0000443 write_file(sb.buf, _("initializing"));
Eric Sunshineb979d952015-07-06 13:30:55 -0400444
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);
Alexandr Miloslavskiy3d7747e2020-03-10 13:11:22 +0000453 strbuf_realpath(&realpath, sb_git.buf, 1);
454 write_file(sb.buf, "%s", realpath.buf);
455 strbuf_realpath(&realpath, get_git_common_dir(), 1);
Junio C Hamano1f76a102015-08-24 13:20:39 -0700456 write_file(sb_git.buf, "gitdir: %s/worktrees/%s",
Alexandr Miloslavskiy3d7747e2020-03-10 13:11:22 +0000457 realpath.buf, name);
Eric Sunshineb979d952015-07-06 13:30:55 -0400458 /*
459 * This is to keep resolve_ref() happy. We need a valid HEAD
Eric Sunshineed197a62015-07-17 19:00:15 -0400460 * 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.
Eric Sunshineb979d952015-07-06 13:30:55 -0400464 */
Eric Sunshineb979d952015-07-06 13:30:55 -0400465 strbuf_reset(&sb);
466 strbuf_addf(&sb, "%s/HEAD", sb_repo.buf);
brian m. carlson14228442021-04-26 01:02:56 +0000467 write_file(sb.buf, "%s", oid_to_hex(null_oid()));
Eric Sunshineb979d952015-07-06 13:30:55 -0400468 strbuf_reset(&sb);
469 strbuf_addf(&sb, "%s/commondir", sb_repo.buf);
Junio C Hamano1f76a102015-08-24 13:20:39 -0700470 write_file(sb.buf, "../..");
Eric Sunshineb979d952015-07-06 13:30:55 -0400471
Derrick Stolee53255912022-02-07 21:33:02 +0000472 /*
473 * If the current worktree has sparse-checkout enabled, then copy
474 * the sparse-checkout patterns from the current worktree.
475 */
Derrick Stoleeace5ac52022-02-23 14:29:11 +0000476 if (core_apply_sparse_checkout)
477 copy_sparse_checkout(sb_repo.buf);
Derrick Stolee53255912022-02-07 21:33:02 +0000478
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 */
Derrick Stolee86397052022-02-23 14:29:10 +0000484 if (repository_format_worktree_config)
485 copy_filtered_worktree_config(sb_repo.buf);
Derrick Stolee53255912022-02-07 21:33:02 +0000486
Jeff King22f9b7f2020-07-28 16:24:27 -0400487 strvec_pushf(&child_env, "%s=%s", GIT_DIR_ENVIRONMENT, sb_git.buf);
488 strvec_pushf(&child_env, "%s=%s", GIT_WORK_TREE_ENVIRONMENT, path);
Eric Sunshineb979d952015-07-06 13:30:55 -0400489 cp.git_cmd = 1;
Eric Sunshine7f44e3d2015-07-17 19:00:14 -0400490
Eric Sunshineade546b2017-12-07 16:20:17 -0500491 if (!is_branch)
Jeff King22f9b7f2020-07-28 16:24:27 -0400492 strvec_pushl(&cp.args, "update-ref", "HEAD",
Jeff Kingf6d89422020-07-28 16:26:31 -0400493 oid_to_hex(&commit->object.oid), NULL);
Elia Pinto371979c2018-08-15 20:56:30 +0000494 else {
Jeff King22f9b7f2020-07-28 16:24:27 -0400495 strvec_pushl(&cp.args, "symbolic-ref", "HEAD",
Jeff Kingf6d89422020-07-28 16:26:31 -0400496 symref.buf, NULL);
Elia Pinto371979c2018-08-15 20:56:30 +0000497 if (opts->quiet)
Jeff King22f9b7f2020-07-28 16:24:27 -0400498 strvec_push(&cp.args, "--quiet");
Elia Pinto371979c2018-08-15 20:56:30 +0000499 }
500
Ævar Arnfjörð Bjarmason29fda242022-06-02 11:09:50 +0200501 strvec_pushv(&cp.env, child_env.v);
Eric Sunshine7f44e3d2015-07-17 19:00:14 -0400502 ret = run_command(&cp);
503 if (ret)
504 goto done;
505
Derrick Stolee23f832e2022-02-23 14:29:12 +0000506 if (opts->checkout &&
507 (ret = checkout_worktree(opts, &child_env)))
508 goto done;
Ray Zhangef2a0ac2016-03-29 10:11:01 +0000509
510 is_junk = 0;
Ævar Arnfjörð Bjarmason88ce3ef2017-06-15 23:15:49 +0000511 FREE_AND_NULL(junk_work_tree);
512 FREE_AND_NULL(junk_git_dir);
Ray Zhangef2a0ac2016-03-29 10:11:01 +0000513
Eric Sunshine7f44e3d2015-07-17 19:00:14 -0400514done:
Nguyễn Thái Ngọc Duy507e6e92017-04-12 20:58:05 +0700515 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 }
Eric Sunshineade546b2017-12-07 16:20:17 -0500520
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 */
Eric Sunshinea4bf1e32018-02-15 14:18:41 -0500525 if (!ret && opts->checkout) {
Emily Shaffer1a3017d2021-12-22 04:59:36 +0100526 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);
Eric Sunshinea4bf1e32018-02-15 14:18:41 -0500537 }
Eric Sunshineade546b2017-12-07 16:20:17 -0500538
Jeff King22f9b7f2020-07-28 16:24:27 -0400539 strvec_clear(&child_env);
Eric Sunshineb979d952015-07-06 13:30:55 -0400540 strbuf_release(&sb);
Eric Sunshinef7c9dac2015-07-17 19:00:13 -0400541 strbuf_release(&symref);
Eric Sunshineb979d952015-07-06 13:30:55 -0400542 strbuf_release(&sb_repo);
543 strbuf_release(&sb_git);
Nguyễn Thái Ngọc Duy1de16ae2019-03-08 16:28:34 +0700544 strbuf_release(&sb_name);
Alexandr Miloslavskiy3d7747e2020-03-10 13:11:22 +0000545 strbuf_release(&realpath);
Eric Sunshineb979d952015-07-06 13:30:55 -0400546 return ret;
547}
548
Thomas Gummerer2c270022018-04-24 22:56:33 +0100549static 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)
Eric Sunshineda8fb6b2021-12-02 22:44:19 -0500557 fprintf_ln(stderr, _("Preparing worktree (new branch '%s')"), new_branch);
Thomas Gummerer2c270022018-04-24 22:56:33 +0100558 else
Eric Sunshineda8fb6b2021-12-02 22:44:19 -0500559 fprintf_ln(stderr, _("Preparing worktree (resetting branch '%s'; was at %s)"),
Thomas Gummerer2c270022018-04-24 22:56:33 +0100560 new_branch,
Ævar Arnfjörð Bjarmasond850b7a2023-03-28 15:58:46 +0200561 repo_find_unique_abbrev(the_repository, &commit->object.oid, DEFAULT_ABBREV));
Thomas Gummerer2c270022018-04-24 22:56:33 +0100562 } else if (new_branch) {
Eric Sunshineda8fb6b2021-12-02 22:44:19 -0500563 fprintf_ln(stderr, _("Preparing worktree (new branch '%s')"), new_branch);
Thomas Gummerer2c270022018-04-24 22:56:33 +0100564 } else {
565 struct strbuf s = STRBUF_INIT;
566 if (!detach && !strbuf_check_branch_ref(&s, branch) &&
567 ref_exists(s.buf))
Eric Sunshineda8fb6b2021-12-02 22:44:19 -0500568 fprintf_ln(stderr, _("Preparing worktree (checking out '%s')"),
Thomas Gummerer2c270022018-04-24 22:56:33 +0100569 branch);
570 else {
571 struct commit *commit = lookup_commit_reference_by_name(branch);
572 if (!commit)
573 die(_("invalid reference: %s"), branch);
Eric Sunshineda8fb6b2021-12-02 22:44:19 -0500574 fprintf_ln(stderr, _("Preparing worktree (detached HEAD %s)"),
Ævar Arnfjörð Bjarmasond850b7a2023-03-28 15:58:46 +0200575 repo_find_unique_abbrev(the_repository, &commit->object.oid, DEFAULT_ABBREV));
Thomas Gummerer2c270022018-04-24 22:56:33 +0100576 }
577 strbuf_release(&s);
578 }
579}
580
Thomas Gummerer6427f872018-04-24 22:56:34 +0100581static const char *dwim_branch(const char *path, const char **new_branch)
582{
583 int n;
Andrzej Huntaa1b6392021-03-14 18:47:37 +0000584 int branch_exists;
Thomas Gummerer6427f872018-04-24 22:56:34 +0100585 const char *s = worktree_basename(path, &n);
Thomas Gummererf60a7b72018-04-24 22:56:35 +0100586 const char *branchname = xstrndup(s, n);
587 struct strbuf ref = STRBUF_INIT;
588
589 UNLEAK(branchname);
Andrzej Huntaa1b6392021-03-14 18:47:37 +0000590
591 branch_exists = !strbuf_check_branch_ref(&ref, branchname) &&
592 ref_exists(ref.buf);
593 strbuf_release(&ref);
594 if (branch_exists)
Thomas Gummererf60a7b72018-04-24 22:56:35 +0100595 return branchname;
Thomas Gummererf60a7b72018-04-24 22:56:35 +0100596
597 *new_branch = branchname;
Thomas Gummerer6427f872018-04-24 22:56:34 +0100598 if (guess_remote) {
599 struct object_id oid;
600 const char *remote =
Ævar Arnfjörð Bjarmason3c87aa92018-06-05 14:40:46 +0000601 unique_tracking_name(*new_branch, &oid, NULL);
Thomas Gummerer6427f872018-04-24 22:56:34 +0100602 return remote;
603 }
604 return NULL;
605}
606
Eric Sunshinefc563612015-07-06 13:30:50 -0400607static int add(int ac, const char **av, const char *prefix)
608{
Eric Sunshine5dd6e232015-07-17 19:00:07 -0400609 struct add_opts opts;
610 const char *new_branch_force = NULL;
Jeff Kinge4da43b2017-03-20 21:28:49 -0400611 char *path;
612 const char *branch;
Thomas Gummererd861d342018-04-24 22:56:32 +0100613 const char *new_branch = NULL;
Thomas Gummerere284e892017-11-26 19:43:53 +0000614 const char *opt_track = NULL;
Stephen Manz0db49612021-07-15 02:32:30 +0000615 const char *lock_reason = NULL;
616 int keep_locked = 0;
Eric Sunshinefc563612015-07-06 13:30:50 -0400617 struct option options[] = {
Nguyễn Thái Ngọc Duy12247812018-02-09 18:01:42 +0700618 OPT__FORCE(&opts.force,
619 N_("checkout <branch> even if already checked out in other worktree"),
Nguyễn Thái Ngọc Duyfc3d4e02018-02-09 18:02:20 +0700620 PARSE_OPT_NOCOMPLETE),
Thomas Gummererd861d342018-04-24 22:56:32 +0100621 OPT_STRING('b', NULL, &new_branch, N_("branch"),
Eric Sunshinecbdf60f2015-07-06 13:30:53 -0400622 N_("create a new branch")),
623 OPT_STRING('B', NULL, &new_branch_force, N_("branch"),
624 N_("create or reset a branch")),
Eric Sunshinec670aa42020-09-06 20:02:21 -0400625 OPT_BOOL('d', "detach", &opts.detach, N_("detach HEAD at named commit")),
Ray Zhangef2a0ac2016-03-29 10:11:01 +0000626 OPT_BOOL(0, "checkout", &opts.checkout, N_("populate the new working tree")),
Stephen Manz0db49612021-07-15 02:32:30 +0000627 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")),
Elia Pinto371979c2018-08-15 20:56:30 +0000630 OPT__QUIET(&opts.quiet, N_("suppress progress reporting")),
Thomas Gummerere284e892017-11-26 19:43:53 +0000631 OPT_PASSTHRU(0, "track", &opt_track, NULL,
632 N_("set up tracking mode (see git-branch(1))"),
633 PARSE_OPT_NOARG | PARSE_OPT_OPTARG),
Thomas Gummerer71d66822017-11-29 20:04:50 +0000634 OPT_BOOL(0, "guess-remote", &guess_remote,
635 N_("try to match the new branch name with a remote-tracking branch")),
Eric Sunshinefc563612015-07-06 13:30:50 -0400636 OPT_END()
637 };
Ævar Arnfjörð Bjarmasonac95f5d2022-11-08 19:17:51 +0100638 int ret;
Eric Sunshinefc563612015-07-06 13:30:50 -0400639
Eric Sunshine5dd6e232015-07-17 19:00:07 -0400640 memset(&opts, 0, sizeof(opts));
Ray Zhangef2a0ac2016-03-29 10:11:01 +0000641 opts.checkout = 1;
Ævar Arnfjörð Bjarmason0afd5562022-10-13 17:39:25 +0200642 ac = parse_options(ac, av, prefix, options, git_worktree_add_usage, 0);
Thomas Gummererd861d342018-04-24 22:56:32 +0100643 if (!!opts.detach + !!new_branch + !!new_branch_force > 1)
Jean-Noël Avilac4881822022-01-05 20:02:15 +0000644 die(_("options '%s', '%s', and '%s' cannot be used together"), "-b", "-B", "--detach");
Stephen Manz0db49612021-07-15 02:32:30 +0000645 if (lock_reason && !keep_locked)
Jean-Noël Avila6fa00ee2022-01-05 20:02:19 +0000646 die(_("the option '%s' requires '%s'"), "--reason", "--lock");
Stephen Manz0db49612021-07-15 02:32:30 +0000647 if (lock_reason)
648 opts.keep_locked = lock_reason;
649 else if (keep_locked)
650 opts.keep_locked = _("added with --lock");
651
Eric Sunshine0f4af3b2015-07-06 13:30:58 -0400652 if (ac < 1 || ac > 2)
Ævar Arnfjörð Bjarmason0afd5562022-10-13 17:39:25 +0200653 usage_with_options(git_worktree_add_usage, options);
Eric Sunshinefc563612015-07-06 13:30:50 -0400654
Jeff King116fb642017-03-20 21:22:28 -0400655 path = prefix_filename(prefix, av[0]);
Eric Sunshine0f4af3b2015-07-06 13:30:58 -0400656 branch = ac < 2 ? "HEAD" : av[1];
Eric Sunshinefc563612015-07-06 13:30:50 -0400657
Jordan DE GEA1a450e22016-05-27 15:17:08 +0200658 if (!strcmp(branch, "-"))
659 branch = "@{-1}";
660
Thomas Gummererd861d342018-04-24 22:56:32 +0100661 if (new_branch_force) {
Nguyễn Thái Ngọc Duybeb6f242016-02-15 20:35:33 +0700662 struct strbuf symref = STRBUF_INIT;
663
Thomas Gummererd861d342018-04-24 22:56:32 +0100664 new_branch = new_branch_force;
Eric Sunshineeef005d2015-07-17 19:00:06 -0400665
Nguyễn Thái Ngọc Duybeb6f242016-02-15 20:35:33 +0700666 if (!opts.force &&
Thomas Gummererd861d342018-04-24 22:56:32 +0100667 !strbuf_check_branch_ref(&symref, new_branch) &&
Nguyễn Thái Ngọc Duybeb6f242016-02-15 20:35:33 +0700668 ref_exists(symref.buf))
Nguyễn Thái Ngọc Duy8d9fdd72016-04-22 20:01:33 +0700669 die_if_checked_out(symref.buf, 0);
Nguyễn Thái Ngọc Duybeb6f242016-02-15 20:35:33 +0700670 strbuf_release(&symref);
671 }
672
Thomas Gummererd861d342018-04-24 22:56:32 +0100673 if (ac < 2 && !new_branch && !opts.detach) {
Thomas Gummerer6427f872018-04-24 22:56:34 +0100674 const char *s = dwim_branch(path, &new_branch);
675 if (s)
676 branch = s;
Eric Sunshine1eb07d82015-07-06 13:30:59 -0400677 }
678
Thomas Gummererd861d342018-04-24 22:56:32 +0100679 if (ac == 2 && !new_branch && !opts.detach) {
Thomas Gummerer4e853332017-11-26 19:43:54 +0000680 struct object_id oid;
681 struct commit *commit;
682 const char *remote;
683
684 commit = lookup_commit_reference_by_name(branch);
685 if (!commit) {
Ævar Arnfjörð Bjarmason3c87aa92018-06-05 14:40:46 +0000686 remote = unique_tracking_name(branch, &oid, NULL);
Thomas Gummerer4e853332017-11-26 19:43:54 +0000687 if (remote) {
Thomas Gummererd861d342018-04-24 22:56:32 +0100688 new_branch = branch;
Thomas Gummerer4e853332017-11-26 19:43:54 +0000689 branch = remote;
690 }
691 }
692 }
Elia Pinto371979c2018-08-15 20:56:30 +0000693 if (!opts.quiet)
694 print_preparing_worktree_line(opts.detach, branch, new_branch, !!new_branch_force);
Thomas Gummerer2c270022018-04-24 22:56:33 +0100695
Thomas Gummererd861d342018-04-24 22:56:32 +0100696 if (new_branch) {
René Scharfe542aa252016-08-05 22:38:44 +0200697 struct child_process cp = CHILD_PROCESS_INIT;
Eric Sunshinec2842432015-07-17 19:00:10 -0400698 cp.git_cmd = 1;
Jeff King22f9b7f2020-07-28 16:24:27 -0400699 strvec_push(&cp.args, "branch");
Thomas Gummererd861d342018-04-24 22:56:32 +0100700 if (new_branch_force)
Jeff King22f9b7f2020-07-28 16:24:27 -0400701 strvec_push(&cp.args, "--force");
Elia Pinto371979c2018-08-15 20:56:30 +0000702 if (opts.quiet)
Jeff King22f9b7f2020-07-28 16:24:27 -0400703 strvec_push(&cp.args, "--quiet");
704 strvec_push(&cp.args, new_branch);
705 strvec_push(&cp.args, branch);
Thomas Gummerere284e892017-11-26 19:43:53 +0000706 if (opt_track)
Jeff King22f9b7f2020-07-28 16:24:27 -0400707 strvec_push(&cp.args, opt_track);
Eric Sunshinec2842432015-07-17 19:00:10 -0400708 if (run_command(&cp))
709 return -1;
Thomas Gummererd861d342018-04-24 22:56:32 +0100710 branch = new_branch;
Thomas Gummerere284e892017-11-26 19:43:53 +0000711 } else if (opt_track) {
712 die(_("--[no-]track can only be used if a new branch is created"));
Eric Sunshinec2842432015-07-17 19:00:10 -0400713 }
Eric Sunshinefc563612015-07-06 13:30:50 -0400714
Ævar Arnfjörð Bjarmasonac95f5d2022-11-08 19:17:51 +0100715 ret = add_worktree(path, branch, &opts);
716 free(path);
717 return ret;
Eric Sunshinefc563612015-07-06 13:30:50 -0400718}
719
Phillip Woodd97eb302022-03-31 16:21:28 +0000720static void show_worktree_porcelain(struct worktree *wt, int line_terminator)
Michael Rappazzobb9c03b2015-10-08 13:01:05 -0400721{
Rafael Silva862c7232021-01-27 09:03:08 +0100722 const char *reason;
723
Phillip Woodd97eb302022-03-31 16:21:28 +0000724 printf("worktree %s%c", wt->path, line_terminator);
Michael Rappazzobb9c03b2015-10-08 13:01:05 -0400725 if (wt->is_bare)
Phillip Woodd97eb302022-03-31 16:21:28 +0000726 printf("bare%c", line_terminator);
Michael Rappazzobb9c03b2015-10-08 13:01:05 -0400727 else {
Phillip Woodd97eb302022-03-31 16:21:28 +0000728 printf("HEAD %s%c", oid_to_hex(&wt->head_oid), line_terminator);
Michael Rappazzobb9c03b2015-10-08 13:01:05 -0400729 if (wt->is_detached)
Phillip Woodd97eb302022-03-31 16:21:28 +0000730 printf("detached%c", line_terminator);
Nguyễn Thái Ngọc Duya2345632016-11-28 16:36:54 +0700731 else if (wt->head_ref)
Phillip Woodd97eb302022-03-31 16:21:28 +0000732 printf("branch %s%c", wt->head_ref, line_terminator);
Michael Rappazzobb9c03b2015-10-08 13:01:05 -0400733 }
Rafael Silva862c7232021-01-27 09:03:08 +0100734
735 reason = worktree_lock_reason(wt);
Phillip Woodd97eb302022-03-31 16:21:28 +0000736 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 }
Rafael Silva862c7232021-01-27 09:03:08 +0100745
Rafael Silva9b19a582021-01-27 09:03:09 +0100746 reason = worktree_prune_reason(wt, expire);
747 if (reason)
Phillip Woodd97eb302022-03-31 16:21:28 +0000748 printf("prunable %s%c", reason, line_terminator);
Rafael Silva9b19a582021-01-27 09:03:09 +0100749
Phillip Woodd97eb302022-03-31 16:21:28 +0000750 fputc(line_terminator, stdout);
Michael Rappazzobb9c03b2015-10-08 13:01:05 -0400751}
752
753static 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);
Rafael Silva076b4442021-01-27 09:03:10 +0100758 const char *reason;
Michael Rappazzobb9c03b2015-10-08 13:01:05 -0400759
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,
Ævar Arnfjörð Bjarmasond850b7a2023-03-28 15:58:46 +0200765 repo_find_unique_abbrev(the_repository, &wt->head_oid, DEFAULT_ABBREV));
Nguyễn Thái Ngọc Duy96f09e22016-11-28 16:36:53 +0700766 if (wt->is_detached)
Michael Rappazzobb9c03b2015-10-08 13:01:05 -0400767 strbuf_addstr(&sb, "(detached HEAD)");
Johannes Schindelin2e11f582017-05-04 15:59:13 +0200768 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
Nguyễn Thái Ngọc Duya2345632016-11-28 16:36:54 +0700773 strbuf_addstr(&sb, "(error)");
Michael Rappazzobb9c03b2015-10-08 13:01:05 -0400774 }
Michael Rappazzobb9c03b2015-10-08 13:01:05 -0400775
Rafael Silva076b4442021-01-27 09:03:10 +0100776 reason = worktree_lock_reason(wt);
777 if (verbose && reason && *reason)
778 strbuf_addf(&sb, "\n\tlocked: %s", reason);
779 else if (reason)
Rafael Silvac57b3362020-10-11 10:11:52 +0000780 strbuf_addstr(&sb, " locked");
781
Rafael Silva076b4442021-01-27 09:03:10 +0100782 reason = worktree_prune_reason(wt, expire);
783 if (verbose && reason)
784 strbuf_addf(&sb, "\n\tprunable: %s", reason);
785 else if (reason)
Rafael Silva9b19a582021-01-27 09:03:09 +0100786 strbuf_addstr(&sb, " prunable");
787
Rafael Silvac57b3362020-10-11 10:11:52 +0000788 printf("%s\n", sb.buf);
Michael Rappazzobb9c03b2015-10-08 13:01:05 -0400789 strbuf_release(&sb);
790}
791
792static 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;
Ævar Arnfjörð Bjarmasond850b7a2023-03-28 15:58:46 +0200802 sha1_len = strlen(repo_find_unique_abbrev(the_repository, &wt[i]->head_oid, *abbrev));
Michael Rappazzobb9c03b2015-10-08 13:01:05 -0400803 if (sha1_len > *abbrev)
804 *abbrev = sha1_len;
805 }
806}
807
Eric Sunshined9c54c22020-06-19 19:35:43 -0400808static 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
815static 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
Michael Rappazzobb9c03b2015-10-08 13:01:05 -0400825static int list(int ac, const char **av, const char *prefix)
826{
827 int porcelain = 0;
Phillip Woodd97eb302022-03-31 16:21:28 +0000828 int line_terminator = '\n';
Michael Rappazzobb9c03b2015-10-08 13:01:05 -0400829
830 struct option options[] = {
831 OPT_BOOL(0, "porcelain", &porcelain, N_("machine-readable output")),
Rafael Silva076b4442021-01-27 09:03:10 +0100832 OPT__VERBOSE(&verbose, N_("show extended annotations and reasons, if available")),
Rafael Silva9b19a582021-01-27 09:03:09 +0100833 OPT_EXPIRY_DATE(0, "expire", &expire,
834 N_("add 'prunable' annotation to worktrees older than <time>")),
Phillip Woodd97eb302022-03-31 16:21:28 +0000835 OPT_SET_INT('z', NULL, &line_terminator,
836 N_("terminate records with a NUL character"), '\0'),
Michael Rappazzobb9c03b2015-10-08 13:01:05 -0400837 OPT_END()
838 };
839
Rafael Silva9b19a582021-01-27 09:03:09 +0100840 expire = TIME_MAX;
Ævar Arnfjörð Bjarmason0afd5562022-10-13 17:39:25 +0200841 ac = parse_options(ac, av, prefix, options, git_worktree_list_usage, 0);
Michael Rappazzobb9c03b2015-10-08 13:01:05 -0400842 if (ac)
Ævar Arnfjörð Bjarmason0afd5562022-10-13 17:39:25 +0200843 usage_with_options(git_worktree_list_usage, options);
Rafael Silva076b4442021-01-27 09:03:10 +0100844 else if (verbose && porcelain)
Jean-Noël Avila43ea6352022-01-05 20:02:14 +0000845 die(_("options '%s' and '%s' cannot be used together"), "--verbose", "--porcelain");
Phillip Woodd97eb302022-03-31 16:21:28 +0000846 else if (!line_terminator && !porcelain)
847 die(_("the option '%s' requires '%s'"), "-z", "--porcelain");
Michael Rappazzobb9c03b2015-10-08 13:01:05 -0400848 else {
Eric Sunshine03f24652020-06-19 19:35:44 -0400849 struct worktree **worktrees = get_worktrees();
Michael Rappazzobb9c03b2015-10-08 13:01:05 -0400850 int path_maxlen = 0, abbrev = DEFAULT_ABBREV, i;
851
Eric Sunshined9c54c22020-06-19 19:35:43 -0400852 /* sort worktrees by path but keep main worktree at top */
853 pathsort(worktrees + 1);
854
Michael Rappazzobb9c03b2015-10-08 13:01:05 -0400855 if (!porcelain)
856 measure_widths(worktrees, &abbrev, &path_maxlen);
857
858 for (i = 0; worktrees[i]; i++) {
859 if (porcelain)
Phillip Woodd97eb302022-03-31 16:21:28 +0000860 show_worktree_porcelain(worktrees[i],
861 line_terminator);
Michael Rappazzobb9c03b2015-10-08 13:01:05 -0400862 else
863 show_worktree(worktrees[i], path_maxlen, abbrev);
864 }
865 free_worktrees(worktrees);
866 }
867 return 0;
868}
869
Nguyễn Thái Ngọc Duy58142c02016-06-13 19:18:24 +0700870static 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
Ævar Arnfjörð Bjarmason0afd5562022-10-13 17:39:25 +0200880 ac = parse_options(ac, av, prefix, options, git_worktree_lock_usage, 0);
Nguyễn Thái Ngọc Duy58142c02016-06-13 19:18:24 +0700881 if (ac != 1)
Ævar Arnfjörð Bjarmason0afd5562022-10-13 17:39:25 +0200882 usage_with_options(git_worktree_lock_usage, options);
Nguyễn Thái Ngọc Duy58142c02016-06-13 19:18:24 +0700883
Eric Sunshine03f24652020-06-19 19:35:44 -0400884 worktrees = get_worktrees();
Nguyễn Thái Ngọc Duy58142c02016-06-13 19:18:24 +0700885 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
Nickolai Belakovskid236f122018-10-29 23:24:09 -0700891 old_reason = worktree_lock_reason(wt);
Nguyễn Thái Ngọc Duy58142c02016-06-13 19:18:24 +0700892 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
Nguyễn Thái Ngọc Duy6d308622016-06-13 19:18:25 +0700905static 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
Ævar Arnfjörð Bjarmason0afd5562022-10-13 17:39:25 +0200913 ac = parse_options(ac, av, prefix, options, git_worktree_unlock_usage, 0);
Nguyễn Thái Ngọc Duy6d308622016-06-13 19:18:25 +0700914 if (ac != 1)
Ævar Arnfjörð Bjarmason0afd5562022-10-13 17:39:25 +0200915 usage_with_options(git_worktree_unlock_usage, options);
Nguyễn Thái Ngọc Duy6d308622016-06-13 19:18:25 +0700916
Eric Sunshine03f24652020-06-19 19:35:44 -0400917 worktrees = get_worktrees();
Nguyễn Thái Ngọc Duy6d308622016-06-13 19:18:25 +0700918 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"));
Nickolai Belakovskid236f122018-10-29 23:24:09 -0700923 if (!worktree_lock_reason(wt))
Nguyễn Thái Ngọc Duy6d308622016-06-13 19:18:25 +0700924 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
Nguyễn Thái Ngọc Duy78d986b2018-02-12 16:49:38 +0700930static void validate_no_submodules(const struct worktree *wt)
931{
Ævar Arnfjörð Bjarmason6269f8e2023-01-17 14:57:00 +0100932 struct index_state istate = INDEX_STATE_INIT(the_repository);
Nguyễn Thái Ngọc Duy00a6d4d2019-01-05 12:08:40 +0700933 struct strbuf path = STRBUF_INIT;
Nguyễn Thái Ngọc Duy78d986b2018-02-12 16:49:38 +0700934 int i, found_submodules = 0;
935
Nguyễn Thái Ngọc Duy00a6d4d2019-01-05 12:08:40 +0700936 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) {
Nguyễn Thái Ngọc Duy78d986b2018-02-12 16:49:38 +0700945 for (i = 0; i < istate.cache_nr; i++) {
946 struct cache_entry *ce = istate.cache[i];
Nguyễn Thái Ngọc Duy00a6d4d2019-01-05 12:08:40 +0700947 int err;
Nguyễn Thái Ngọc Duy78d986b2018-02-12 16:49:38 +0700948
Nguyễn Thái Ngọc Duy00a6d4d2019-01-05 12:08:40 +0700949 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;
Nguyễn Thái Ngọc Duy78d986b2018-02-12 16:49:38 +0700959 }
960 }
961 discard_index(&istate);
Nguyễn Thái Ngọc Duy00a6d4d2019-01-05 12:08:40 +0700962 strbuf_release(&path);
Nguyễn Thái Ngọc Duy78d986b2018-02-12 16:49:38 +0700963
964 if (found_submodules)
Nguyễn Thái Ngọc Duycc733852018-02-12 16:49:39 +0700965 die(_("working trees containing submodules cannot be moved or removed"));
Nguyễn Thái Ngọc Duy78d986b2018-02-12 16:49:38 +0700966}
967
Nguyễn Thái Ngọc Duy9f792bb2018-02-12 16:49:36 +0700968static int move_worktree(int ac, const char **av, const char *prefix)
969{
Eric Sunshine68a6b3a2018-08-28 17:20:24 -0400970 int force = 0;
Nguyễn Thái Ngọc Duy9f792bb2018-02-12 16:49:36 +0700971 struct option options[] = {
Eric Sunshine68a6b3a2018-08-28 17:20:24 -0400972 OPT__FORCE(&force,
973 N_("force move even if worktree is dirty or locked"),
974 PARSE_OPT_NOCOMPLETE),
Nguyễn Thái Ngọc Duy9f792bb2018-02-12 16:49:36 +0700975 OPT_END()
976 };
977 struct worktree **worktrees, *wt;
978 struct strbuf dst = STRBUF_INIT;
979 struct strbuf errmsg = STRBUF_INIT;
Eric Sunshine68a6b3a2018-08-28 17:20:24 -0400980 const char *reason = NULL;
Nguyễn Thái Ngọc Duy9f792bb2018-02-12 16:49:36 +0700981 char *path;
982
Ævar Arnfjörð Bjarmason0afd5562022-10-13 17:39:25 +0200983 ac = parse_options(ac, av, prefix, options, git_worktree_move_usage,
984 0);
Nguyễn Thái Ngọc Duy9f792bb2018-02-12 16:49:36 +0700985 if (ac != 2)
Ævar Arnfjörð Bjarmason0afd5562022-10-13 17:39:25 +0200986 usage_with_options(git_worktree_move_usage, options);
Nguyễn Thái Ngọc Duy9f792bb2018-02-12 16:49:36 +0700987
988 path = prefix_filename(prefix, av[1]);
989 strbuf_addstr(&dst, path);
990 free(path);
991
Eric Sunshine03f24652020-06-19 19:35:44 -0400992 worktrees = get_worktrees();
Nguyễn Thái Ngọc Duy9f792bb2018-02-12 16:49:36 +0700993 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]);
Nguyễn Thái Ngọc Duyc64a8d22018-02-12 16:49:37 +0700998 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 }
Eric Sunshine810382e2020-06-10 02:30:49 -04001007 check_candidate_path(dst.buf, force, worktrees, "move");
Nguyễn Thái Ngọc Duy9f792bb2018-02-12 16:49:36 +07001008
Nguyễn Thái Ngọc Duy78d986b2018-02-12 16:49:38 +07001009 validate_no_submodules(wt);
1010
Eric Sunshine68a6b3a2018-08-28 17:20:24 -04001011 if (force < 2)
Nickolai Belakovskid236f122018-10-29 23:24:09 -07001012 reason = worktree_lock_reason(wt);
Nguyễn Thái Ngọc Duy9f792bb2018-02-12 16:49:36 +07001013 if (reason) {
1014 if (*reason)
Eric Sunshine68a6b3a2018-08-28 17:20:24 -04001015 die(_("cannot move a locked working tree, lock reason: %s\nuse 'move -f -f' to override or unlock first"),
Nguyễn Thái Ngọc Duy9f792bb2018-02-12 16:49:36 +07001016 reason);
Eric Sunshine68a6b3a2018-08-28 17:20:24 -04001017 die(_("cannot move a locked working tree;\nuse 'move -f -f' to override or unlock first"));
Nguyễn Thái Ngọc Duy9f792bb2018-02-12 16:49:36 +07001018 }
Nguyễn Thái Ngọc Duyee6763a2018-02-12 16:49:40 +07001019 if (validate_worktree(wt, &errmsg, 0))
Nguyễn Thái Ngọc Duy9f792bb2018-02-12 16:49:36 +07001020 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
Nguyễn Thái Ngọc Duycc733852018-02-12 16:49:39 +07001034/*
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 */
1045static void check_clean_worktree(struct worktree *wt,
1046 const char *original_path)
1047{
Nguyễn Thái Ngọc Duycc733852018-02-12 16:49:39 +07001048 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
Jeff King27ed6cc2020-08-27 01:25:04 -04001058 child_process_init(&cp);
Ævar Arnfjörð Bjarmason29fda242022-06-02 11:09:50 +02001059 strvec_pushf(&cp.env, "%s=%s/.git",
Jeff Kingf6d89422020-07-28 16:26:31 -04001060 GIT_DIR_ENVIRONMENT, wt->path);
Ævar Arnfjörð Bjarmason29fda242022-06-02 11:09:50 +02001061 strvec_pushf(&cp.env, "%s=%s",
Jeff Kingf6d89422020-07-28 16:26:31 -04001062 GIT_WORK_TREE_ENVIRONMENT, wt->path);
Jeff King22f9b7f2020-07-28 16:24:27 -04001063 strvec_pushl(&cp.args, "status",
Jeff Kingf6d89422020-07-28 16:26:31 -04001064 "--porcelain", "--ignore-submodules=none",
1065 NULL);
Nguyễn Thái Ngọc Duycc733852018-02-12 16:49:39 +07001066 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)
SZEDER Gábor507e5472019-08-13 20:02:44 +02001075 die(_("'%s' contains modified or untracked files, use --force to delete it"),
Nguyễn Thái Ngọc Duycc733852018-02-12 16:49:39 +07001076 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
1084static 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
Nguyễn Thái Ngọc Duycc733852018-02-12 16:49:39 +07001098static int remove_worktree(int ac, const char **av, const char *prefix)
1099{
1100 int force = 0;
1101 struct option options[] = {
Stefan Bellerd228eea2018-04-17 11:19:39 -07001102 OPT__FORCE(&force,
Eric Sunshinef4143102018-08-28 17:20:25 -04001103 N_("force removal even if worktree is dirty or locked"),
Stefan Bellerd228eea2018-04-17 11:19:39 -07001104 PARSE_OPT_NOCOMPLETE),
Nguyễn Thái Ngọc Duycc733852018-02-12 16:49:39 +07001105 OPT_END()
1106 };
1107 struct worktree **worktrees, *wt;
1108 struct strbuf errmsg = STRBUF_INIT;
Eric Sunshinef4143102018-08-28 17:20:25 -04001109 const char *reason = NULL;
Nguyễn Thái Ngọc Duycc733852018-02-12 16:49:39 +07001110 int ret = 0;
1111
Ævar Arnfjörð Bjarmason0afd5562022-10-13 17:39:25 +02001112 ac = parse_options(ac, av, prefix, options, git_worktree_remove_usage, 0);
Nguyễn Thái Ngọc Duycc733852018-02-12 16:49:39 +07001113 if (ac != 1)
Ævar Arnfjörð Bjarmason0afd5562022-10-13 17:39:25 +02001114 usage_with_options(git_worktree_remove_usage, options);
Nguyễn Thái Ngọc Duycc733852018-02-12 16:49:39 +07001115
Eric Sunshine03f24652020-06-19 19:35:44 -04001116 worktrees = get_worktrees();
Nguyễn Thái Ngọc Duycc733852018-02-12 16:49:39 +07001117 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]);
Eric Sunshinef4143102018-08-28 17:20:25 -04001122 if (force < 2)
Nickolai Belakovskid236f122018-10-29 23:24:09 -07001123 reason = worktree_lock_reason(wt);
Nguyễn Thái Ngọc Duycc733852018-02-12 16:49:39 +07001124 if (reason) {
1125 if (*reason)
Eric Sunshinef4143102018-08-28 17:20:25 -04001126 die(_("cannot remove a locked working tree, lock reason: %s\nuse 'remove -f -f' to override or unlock first"),
Nguyễn Thái Ngọc Duycc733852018-02-12 16:49:39 +07001127 reason);
Eric Sunshinef4143102018-08-28 17:20:25 -04001128 die(_("cannot remove a locked working tree;\nuse 'remove -f -f' to override or unlock first"));
Nguyễn Thái Ngọc Duycc733852018-02-12 16:49:39 +07001129 }
Nguyễn Thái Ngọc Duyee6763a2018-02-12 16:49:40 +07001130 if (validate_worktree(wt, &errmsg, WT_VALIDATE_WORKTREE_MISSING_OK))
Nguyễn Thái Ngọc Duycc733852018-02-12 16:49:39 +07001131 die(_("validation failed, cannot remove working tree: %s"),
1132 errmsg.buf);
1133 strbuf_release(&errmsg);
1134
Nguyễn Thái Ngọc Duyee6763a2018-02-12 16:49:40 +07001135 if (file_exists(wt->path)) {
1136 if (!force)
1137 check_clean_worktree(wt, av[0]);
Nguyễn Thái Ngọc Duycc733852018-02-12 16:49:39 +07001138
Nguyễn Thái Ngọc Duyee6763a2018-02-12 16:49:40 +07001139 ret |= delete_git_work_tree(wt);
1140 }
Nguyễn Thái Ngọc Duycc733852018-02-12 16:49:39 +07001141 /*
1142 * continue on even if ret is non-zero, there's no going back
1143 * from here.
1144 */
Eric Sunshine602aaed2018-08-28 17:20:20 -04001145 ret |= delete_git_dir(wt->id);
Eric Sunshine3a540432018-08-28 17:20:26 -04001146 delete_worktrees_dir_if_empty();
Nguyễn Thái Ngọc Duycc733852018-02-12 16:49:39 +07001147
1148 free_worktrees(worktrees);
1149 return ret;
1150}
1151
Eric Sunshinebdd1f3e2020-08-31 02:57:57 -04001152static void report_repair(int iserr, const char *path, const char *msg, void *cb_data)
1153{
1154 if (!iserr) {
Eric Sunshineda8fb6b2021-12-02 22:44:19 -05001155 fprintf_ln(stderr, _("repair: %s: %s"), msg, path);
Eric Sunshinebdd1f3e2020-08-31 02:57:57 -04001156 } else {
1157 int *exit_status = (int *)cb_data;
1158 fprintf_ln(stderr, _("error: %s: %s"), msg, path);
1159 *exit_status = 1;
1160 }
1161}
1162
Eric Sunshinee8e1ff22020-08-27 04:21:25 -04001163static int repair(int ac, const char **av, const char *prefix)
1164{
Eric Sunshineb214ab52020-08-31 02:57:58 -04001165 const char **p;
1166 const char *self[] = { ".", NULL };
Eric Sunshinee8e1ff22020-08-27 04:21:25 -04001167 struct option options[] = {
1168 OPT_END()
1169 };
1170 int rc = 0;
1171
Ævar Arnfjörð Bjarmason0afd5562022-10-13 17:39:25 +02001172 ac = parse_options(ac, av, prefix, options, git_worktree_repair_usage, 0);
Eric Sunshineb214ab52020-08-31 02:57:58 -04001173 p = ac > 0 ? av : self;
1174 for (; *p; p++)
1175 repair_worktree_at_path(*p, report_repair, &rc);
Eric Sunshinecf76bae2020-12-21 03:16:01 -05001176 repair_worktrees(report_repair, &rc);
Eric Sunshinee8e1ff22020-08-27 04:21:25 -04001177 return rc;
1178}
1179
Nguyễn Thái Ngọc Duydf0b6cf2015-06-29 19:51:18 +07001180int cmd_worktree(int ac, const char **av, const char *prefix)
1181{
SZEDER Gábor398c4ff2022-08-19 18:04:11 +02001182 parse_opt_subcommand_fn *fn = NULL;
Nguyễn Thái Ngọc Duydf0b6cf2015-06-29 19:51:18 +07001183 struct option options[] = {
SZEDER Gábor398c4ff2022-08-19 18:04:11 +02001184 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),
Nguyễn Thái Ngọc Duydf0b6cf2015-06-29 19:51:18 +07001192 OPT_END()
1193 };
1194
Thomas Gummerere92445a2017-11-29 20:04:51 +00001195 git_config(git_worktree_config, NULL);
Junio C Hamanod49028e2016-09-26 23:49:39 -07001196
Nguyễn Thái Ngọc Duy0409e0b2016-05-22 16:33:56 +07001197 if (!prefix)
1198 prefix = "";
SZEDER Gábor398c4ff2022-08-19 18:04:11 +02001199
Ævar Arnfjörð Bjarmason0afd5562022-10-13 17:39:25 +02001200 ac = parse_options(ac, av, prefix, options, git_worktree_usage, 0);
SZEDER Gábor398c4ff2022-08-19 18:04:11 +02001201 return fn(ac, av, prefix);
Nguyễn Thái Ngọc Duydf0b6cf2015-06-29 19:51:18 +07001202}