trace2 tests: guard pthread test with "PTHREAD"
[git.git] / worktree.c
blobaa43c6411914308798a58e4e3a0a5c55d1eede8f
1 #include "cache.h"
2 #include "repository.h"
3 #include "refs.h"
4 #include "strbuf.h"
5 #include "worktree.h"
6 #include "dir.h"
7 #include "wt-status.h"
8 #include "config.h"
10 void free_worktrees(struct worktree **worktrees)
12 int i = 0;
14 for (i = 0; worktrees[i]; i++) {
15 free(worktrees[i]->path);
16 free(worktrees[i]->id);
17 free(worktrees[i]->head_ref);
18 free(worktrees[i]->lock_reason);
19 free(worktrees[i]->prune_reason);
20 free(worktrees[i]);
22 free (worktrees);
25 /**
26 * Update head_oid, head_ref and is_detached of the given worktree
28 static void add_head_info(struct worktree *wt)
30 int flags;
31 const char *target;
33 target = refs_resolve_ref_unsafe(get_worktree_ref_store(wt),
34 "HEAD",
36 &wt->head_oid, &flags);
37 if (!target)
38 return;
40 if (flags & REF_ISSYMREF)
41 wt->head_ref = xstrdup(target);
42 else
43 wt->is_detached = 1;
46 /**
47 * get the main worktree
49 static struct worktree *get_main_worktree(void)
51 struct worktree *worktree = NULL;
52 struct strbuf worktree_path = STRBUF_INIT;
54 strbuf_add_real_path(&worktree_path, get_git_common_dir());
55 strbuf_strip_suffix(&worktree_path, "/.git");
57 CALLOC_ARRAY(worktree, 1);
58 worktree->path = strbuf_detach(&worktree_path, NULL);
60 * NEEDSWORK: If this function is called from a secondary worktree and
61 * config.worktree is present, is_bare_repository_cfg will reflect the
62 * contents of config.worktree, not the contents of the main worktree.
63 * This means that worktree->is_bare may be set to 0 even if the main
64 * worktree is configured to be bare.
66 worktree->is_bare = (is_bare_repository_cfg == 1) ||
67 is_bare_repository();
68 add_head_info(worktree);
69 return worktree;
72 static struct worktree *get_linked_worktree(const char *id)
74 struct worktree *worktree = NULL;
75 struct strbuf path = STRBUF_INIT;
76 struct strbuf worktree_path = STRBUF_INIT;
78 if (!id)
79 die("Missing linked worktree name");
81 strbuf_git_common_path(&path, the_repository, "worktrees/%s/gitdir", id);
82 if (strbuf_read_file(&worktree_path, path.buf, 0) <= 0)
83 /* invalid gitdir file */
84 goto done;
85 strbuf_rtrim(&worktree_path);
86 strbuf_strip_suffix(&worktree_path, "/.git");
88 CALLOC_ARRAY(worktree, 1);
89 worktree->path = strbuf_detach(&worktree_path, NULL);
90 worktree->id = xstrdup(id);
91 add_head_info(worktree);
93 done:
94 strbuf_release(&path);
95 strbuf_release(&worktree_path);
96 return worktree;
99 static void mark_current_worktree(struct worktree **worktrees)
101 char *git_dir = absolute_pathdup(get_git_dir());
102 int i;
104 for (i = 0; worktrees[i]; i++) {
105 struct worktree *wt = worktrees[i];
106 const char *wt_git_dir = get_worktree_git_dir(wt);
108 if (!fspathcmp(git_dir, absolute_path(wt_git_dir))) {
109 wt->is_current = 1;
110 break;
113 free(git_dir);
116 struct worktree **get_worktrees(void)
118 struct worktree **list = NULL;
119 struct strbuf path = STRBUF_INIT;
120 DIR *dir;
121 struct dirent *d;
122 int counter = 0, alloc = 2;
124 ALLOC_ARRAY(list, alloc);
126 list[counter++] = get_main_worktree();
128 strbuf_addf(&path, "%s/worktrees", get_git_common_dir());
129 dir = opendir(path.buf);
130 strbuf_release(&path);
131 if (dir) {
132 while ((d = readdir_skip_dot_and_dotdot(dir)) != NULL) {
133 struct worktree *linked = NULL;
135 if ((linked = get_linked_worktree(d->d_name))) {
136 ALLOC_GROW(list, counter + 1, alloc);
137 list[counter++] = linked;
140 closedir(dir);
142 ALLOC_GROW(list, counter + 1, alloc);
143 list[counter] = NULL;
145 mark_current_worktree(list);
146 return list;
149 const char *get_worktree_git_dir(const struct worktree *wt)
151 if (!wt)
152 return get_git_dir();
153 else if (!wt->id)
154 return get_git_common_dir();
155 else
156 return git_common_path("worktrees/%s", wt->id);
159 static struct worktree *find_worktree_by_suffix(struct worktree **list,
160 const char *suffix)
162 struct worktree *found = NULL;
163 int nr_found = 0, suffixlen;
165 suffixlen = strlen(suffix);
166 if (!suffixlen)
167 return NULL;
169 for (; *list && nr_found < 2; list++) {
170 const char *path = (*list)->path;
171 int pathlen = strlen(path);
172 int start = pathlen - suffixlen;
174 /* suffix must start at directory boundary */
175 if ((!start || (start > 0 && is_dir_sep(path[start - 1]))) &&
176 !fspathcmp(suffix, path + start)) {
177 found = *list;
178 nr_found++;
181 return nr_found == 1 ? found : NULL;
184 struct worktree *find_worktree(struct worktree **list,
185 const char *prefix,
186 const char *arg)
188 struct worktree *wt;
189 char *to_free = NULL;
191 if ((wt = find_worktree_by_suffix(list, arg)))
192 return wt;
194 if (prefix)
195 arg = to_free = prefix_filename(prefix, arg);
196 wt = find_worktree_by_path(list, arg);
197 free(to_free);
198 return wt;
201 struct worktree *find_worktree_by_path(struct worktree **list, const char *p)
203 struct strbuf wt_path = STRBUF_INIT;
204 char *path = real_pathdup(p, 0);
206 if (!path)
207 return NULL;
208 for (; *list; list++) {
209 if (!strbuf_realpath(&wt_path, (*list)->path, 0))
210 continue;
212 if (!fspathcmp(path, wt_path.buf))
213 break;
215 free(path);
216 strbuf_release(&wt_path);
217 return *list;
220 int is_main_worktree(const struct worktree *wt)
222 return !wt->id;
225 const char *worktree_lock_reason(struct worktree *wt)
227 if (is_main_worktree(wt))
228 return NULL;
230 if (!wt->lock_reason_valid) {
231 struct strbuf path = STRBUF_INIT;
233 strbuf_addstr(&path, worktree_git_path(wt, "locked"));
234 if (file_exists(path.buf)) {
235 struct strbuf lock_reason = STRBUF_INIT;
236 if (strbuf_read_file(&lock_reason, path.buf, 0) < 0)
237 die_errno(_("failed to read '%s'"), path.buf);
238 strbuf_trim(&lock_reason);
239 wt->lock_reason = strbuf_detach(&lock_reason, NULL);
240 } else
241 wt->lock_reason = NULL;
242 wt->lock_reason_valid = 1;
243 strbuf_release(&path);
246 return wt->lock_reason;
249 const char *worktree_prune_reason(struct worktree *wt, timestamp_t expire)
251 struct strbuf reason = STRBUF_INIT;
252 char *path = NULL;
254 if (is_main_worktree(wt))
255 return NULL;
256 if (wt->prune_reason_valid)
257 return wt->prune_reason;
259 if (should_prune_worktree(wt->id, &reason, &path, expire))
260 wt->prune_reason = strbuf_detach(&reason, NULL);
261 wt->prune_reason_valid = 1;
263 strbuf_release(&reason);
264 free(path);
265 return wt->prune_reason;
268 /* convenient wrapper to deal with NULL strbuf */
269 __attribute__((format (printf, 2, 3)))
270 static void strbuf_addf_gently(struct strbuf *buf, const char *fmt, ...)
272 va_list params;
274 if (!buf)
275 return;
277 va_start(params, fmt);
278 strbuf_vaddf(buf, fmt, params);
279 va_end(params);
282 int validate_worktree(const struct worktree *wt, struct strbuf *errmsg,
283 unsigned flags)
285 struct strbuf wt_path = STRBUF_INIT;
286 struct strbuf realpath = STRBUF_INIT;
287 char *path = NULL;
288 int err, ret = -1;
290 strbuf_addf(&wt_path, "%s/.git", wt->path);
292 if (is_main_worktree(wt)) {
293 if (is_directory(wt_path.buf)) {
294 ret = 0;
295 goto done;
298 * Main worktree using .git file to point to the
299 * repository would make it impossible to know where
300 * the actual worktree is if this function is executed
301 * from another worktree. No .git file support for now.
303 strbuf_addf_gently(errmsg,
304 _("'%s' at main working tree is not the repository directory"),
305 wt_path.buf);
306 goto done;
310 * Make sure "gitdir" file points to a real .git file and that
311 * file points back here.
313 if (!is_absolute_path(wt->path)) {
314 strbuf_addf_gently(errmsg,
315 _("'%s' file does not contain absolute path to the working tree location"),
316 git_common_path("worktrees/%s/gitdir", wt->id));
317 goto done;
320 if (flags & WT_VALIDATE_WORKTREE_MISSING_OK &&
321 !file_exists(wt->path)) {
322 ret = 0;
323 goto done;
326 if (!file_exists(wt_path.buf)) {
327 strbuf_addf_gently(errmsg, _("'%s' does not exist"), wt_path.buf);
328 goto done;
331 path = xstrdup_or_null(read_gitfile_gently(wt_path.buf, &err));
332 if (!path) {
333 strbuf_addf_gently(errmsg, _("'%s' is not a .git file, error code %d"),
334 wt_path.buf, err);
335 goto done;
338 strbuf_realpath(&realpath, git_common_path("worktrees/%s", wt->id), 1);
339 ret = fspathcmp(path, realpath.buf);
341 if (ret)
342 strbuf_addf_gently(errmsg, _("'%s' does not point back to '%s'"),
343 wt->path, git_common_path("worktrees/%s", wt->id));
344 done:
345 free(path);
346 strbuf_release(&wt_path);
347 strbuf_release(&realpath);
348 return ret;
351 void update_worktree_location(struct worktree *wt, const char *path_)
353 struct strbuf path = STRBUF_INIT;
355 if (is_main_worktree(wt))
356 BUG("can't relocate main worktree");
358 strbuf_realpath(&path, path_, 1);
359 if (fspathcmp(wt->path, path.buf)) {
360 write_file(git_common_path("worktrees/%s/gitdir", wt->id),
361 "%s/.git", path.buf);
362 free(wt->path);
363 wt->path = strbuf_detach(&path, NULL);
365 strbuf_release(&path);
368 int is_worktree_being_rebased(const struct worktree *wt,
369 const char *target)
371 struct wt_status_state state;
372 int found_rebase;
374 memset(&state, 0, sizeof(state));
375 found_rebase = wt_status_check_rebase(wt, &state) &&
376 (state.rebase_in_progress ||
377 state.rebase_interactive_in_progress) &&
378 state.branch &&
379 skip_prefix(target, "refs/heads/", &target) &&
380 !strcmp(state.branch, target);
381 wt_status_state_free_buffers(&state);
382 return found_rebase;
385 int is_worktree_being_bisected(const struct worktree *wt,
386 const char *target)
388 struct wt_status_state state;
389 int found_bisect;
391 memset(&state, 0, sizeof(state));
392 found_bisect = wt_status_check_bisect(wt, &state) &&
393 state.branch &&
394 skip_prefix(target, "refs/heads/", &target) &&
395 !strcmp(state.branch, target);
396 wt_status_state_free_buffers(&state);
397 return found_bisect;
401 * note: this function should be able to detect shared symref even if
402 * HEAD is temporarily detached (e.g. in the middle of rebase or
403 * bisect). New commands that do similar things should update this
404 * function as well.
406 const struct worktree *find_shared_symref(struct worktree **worktrees,
407 const char *symref,
408 const char *target)
410 const struct worktree *existing = NULL;
411 int i = 0;
413 for (i = 0; worktrees[i]; i++) {
414 struct worktree *wt = worktrees[i];
415 const char *symref_target;
416 struct ref_store *refs;
417 int flags;
419 if (wt->is_bare)
420 continue;
422 if (wt->is_detached && !strcmp(symref, "HEAD")) {
423 if (is_worktree_being_rebased(wt, target)) {
424 existing = wt;
425 break;
427 if (is_worktree_being_bisected(wt, target)) {
428 existing = wt;
429 break;
433 refs = get_worktree_ref_store(wt);
434 symref_target = refs_resolve_ref_unsafe(refs, symref, 0,
435 NULL, &flags);
436 if ((flags & REF_ISSYMREF) &&
437 symref_target && !strcmp(symref_target, target)) {
438 existing = wt;
439 break;
443 return existing;
446 int submodule_uses_worktrees(const char *path)
448 char *submodule_gitdir;
449 struct strbuf sb = STRBUF_INIT, err = STRBUF_INIT;
450 DIR *dir;
451 struct dirent *d;
452 int ret = 0;
453 struct repository_format format = REPOSITORY_FORMAT_INIT;
455 submodule_gitdir = git_pathdup_submodule(path, "%s", "");
456 if (!submodule_gitdir)
457 return 0;
459 /* The env would be set for the superproject. */
460 get_common_dir_noenv(&sb, submodule_gitdir);
461 free(submodule_gitdir);
463 strbuf_addstr(&sb, "/config");
464 read_repository_format(&format, sb.buf);
465 if (verify_repository_format(&format, &err)) {
466 strbuf_release(&err);
467 strbuf_release(&sb);
468 clear_repository_format(&format);
469 return 1;
471 clear_repository_format(&format);
472 strbuf_release(&err);
474 /* Replace config by worktrees. */
475 strbuf_setlen(&sb, sb.len - strlen("config"));
476 strbuf_addstr(&sb, "worktrees");
478 /* See if there is any file inside the worktrees directory. */
479 dir = opendir(sb.buf);
480 strbuf_release(&sb);
482 if (!dir)
483 return 0;
485 d = readdir_skip_dot_and_dotdot(dir);
486 if (d)
487 ret = 1;
488 closedir(dir);
489 return ret;
492 void strbuf_worktree_ref(const struct worktree *wt,
493 struct strbuf *sb,
494 const char *refname)
496 if (parse_worktree_ref(refname, NULL, NULL, NULL) ==
497 REF_WORKTREE_CURRENT &&
498 wt && !wt->is_current) {
499 if (is_main_worktree(wt))
500 strbuf_addstr(sb, "main-worktree/");
501 else
502 strbuf_addf(sb, "worktrees/%s/", wt->id);
504 strbuf_addstr(sb, refname);
507 int other_head_refs(each_ref_fn fn, void *cb_data)
509 struct worktree **worktrees, **p;
510 struct strbuf refname = STRBUF_INIT;
511 int ret = 0;
513 worktrees = get_worktrees();
514 for (p = worktrees; *p; p++) {
515 struct worktree *wt = *p;
516 struct object_id oid;
517 int flag;
519 if (wt->is_current)
520 continue;
522 strbuf_reset(&refname);
523 strbuf_worktree_ref(wt, &refname, "HEAD");
524 if (refs_resolve_ref_unsafe(get_main_ref_store(the_repository),
525 refname.buf,
526 RESOLVE_REF_READING,
527 &oid, &flag))
528 ret = fn(refname.buf, &oid, flag, cb_data);
529 if (ret)
530 break;
532 free_worktrees(worktrees);
533 strbuf_release(&refname);
534 return ret;
538 * Repair worktree's /path/to/worktree/.git file if missing, corrupt, or not
539 * pointing at <repo>/worktrees/<id>.
541 static void repair_gitfile(struct worktree *wt,
542 worktree_repair_fn fn, void *cb_data)
544 struct strbuf dotgit = STRBUF_INIT;
545 struct strbuf repo = STRBUF_INIT;
546 char *backlink;
547 const char *repair = NULL;
548 int err;
550 /* missing worktree can't be repaired */
551 if (!file_exists(wt->path))
552 return;
554 if (!is_directory(wt->path)) {
555 fn(1, wt->path, _("not a directory"), cb_data);
556 return;
559 strbuf_realpath(&repo, git_common_path("worktrees/%s", wt->id), 1);
560 strbuf_addf(&dotgit, "%s/.git", wt->path);
561 backlink = xstrdup_or_null(read_gitfile_gently(dotgit.buf, &err));
563 if (err == READ_GITFILE_ERR_NOT_A_FILE)
564 fn(1, wt->path, _(".git is not a file"), cb_data);
565 else if (err)
566 repair = _(".git file broken");
567 else if (fspathcmp(backlink, repo.buf))
568 repair = _(".git file incorrect");
570 if (repair) {
571 fn(0, wt->path, repair, cb_data);
572 write_file(dotgit.buf, "gitdir: %s", repo.buf);
575 free(backlink);
576 strbuf_release(&repo);
577 strbuf_release(&dotgit);
580 static void repair_noop(int iserr, const char *path, const char *msg,
581 void *cb_data)
583 /* nothing */
586 void repair_worktrees(worktree_repair_fn fn, void *cb_data)
588 struct worktree **worktrees = get_worktrees();
589 struct worktree **wt = worktrees + 1; /* +1 skips main worktree */
591 if (!fn)
592 fn = repair_noop;
593 for (; *wt; wt++)
594 repair_gitfile(*wt, fn, cb_data);
595 free_worktrees(worktrees);
598 static int is_main_worktree_path(const char *path)
600 struct strbuf target = STRBUF_INIT;
601 struct strbuf maindir = STRBUF_INIT;
602 int cmp;
604 strbuf_add_real_path(&target, path);
605 strbuf_strip_suffix(&target, "/.git");
606 strbuf_add_real_path(&maindir, get_git_common_dir());
607 strbuf_strip_suffix(&maindir, "/.git");
608 cmp = fspathcmp(maindir.buf, target.buf);
610 strbuf_release(&maindir);
611 strbuf_release(&target);
612 return !cmp;
616 * If both the main worktree and linked worktree have been moved, then the
617 * gitfile /path/to/worktree/.git won't point into the repository, thus we
618 * won't know which <repo>/worktrees/<id>/gitdir to repair. However, we may
619 * be able to infer the gitdir by manually reading /path/to/worktree/.git,
620 * extracting the <id>, and checking if <repo>/worktrees/<id> exists.
622 static char *infer_backlink(const char *gitfile)
624 struct strbuf actual = STRBUF_INIT;
625 struct strbuf inferred = STRBUF_INIT;
626 const char *id;
628 if (strbuf_read_file(&actual, gitfile, 0) < 0)
629 goto error;
630 if (!starts_with(actual.buf, "gitdir:"))
631 goto error;
632 if (!(id = find_last_dir_sep(actual.buf)))
633 goto error;
634 strbuf_trim(&actual);
635 id++; /* advance past '/' to point at <id> */
636 if (!*id)
637 goto error;
638 strbuf_git_common_path(&inferred, the_repository, "worktrees/%s", id);
639 if (!is_directory(inferred.buf))
640 goto error;
642 strbuf_release(&actual);
643 return strbuf_detach(&inferred, NULL);
645 error:
646 strbuf_release(&actual);
647 strbuf_release(&inferred);
648 return NULL;
652 * Repair <repo>/worktrees/<id>/gitdir if missing, corrupt, or not pointing at
653 * the worktree's path.
655 void repair_worktree_at_path(const char *path,
656 worktree_repair_fn fn, void *cb_data)
658 struct strbuf dotgit = STRBUF_INIT;
659 struct strbuf realdotgit = STRBUF_INIT;
660 struct strbuf gitdir = STRBUF_INIT;
661 struct strbuf olddotgit = STRBUF_INIT;
662 char *backlink = NULL;
663 const char *repair = NULL;
664 int err;
666 if (!fn)
667 fn = repair_noop;
669 if (is_main_worktree_path(path))
670 goto done;
672 strbuf_addf(&dotgit, "%s/.git", path);
673 if (!strbuf_realpath(&realdotgit, dotgit.buf, 0)) {
674 fn(1, path, _("not a valid path"), cb_data);
675 goto done;
678 backlink = xstrdup_or_null(read_gitfile_gently(realdotgit.buf, &err));
679 if (err == READ_GITFILE_ERR_NOT_A_FILE) {
680 fn(1, realdotgit.buf, _("unable to locate repository; .git is not a file"), cb_data);
681 goto done;
682 } else if (err == READ_GITFILE_ERR_NOT_A_REPO) {
683 if (!(backlink = infer_backlink(realdotgit.buf))) {
684 fn(1, realdotgit.buf, _("unable to locate repository; .git file does not reference a repository"), cb_data);
685 goto done;
687 } else if (err) {
688 fn(1, realdotgit.buf, _("unable to locate repository; .git file broken"), cb_data);
689 goto done;
692 strbuf_addf(&gitdir, "%s/gitdir", backlink);
693 if (strbuf_read_file(&olddotgit, gitdir.buf, 0) < 0)
694 repair = _("gitdir unreadable");
695 else {
696 strbuf_rtrim(&olddotgit);
697 if (fspathcmp(olddotgit.buf, realdotgit.buf))
698 repair = _("gitdir incorrect");
701 if (repair) {
702 fn(0, gitdir.buf, repair, cb_data);
703 write_file(gitdir.buf, "%s", realdotgit.buf);
705 done:
706 free(backlink);
707 strbuf_release(&olddotgit);
708 strbuf_release(&gitdir);
709 strbuf_release(&realdotgit);
710 strbuf_release(&dotgit);
713 int should_prune_worktree(const char *id, struct strbuf *reason, char **wtpath, timestamp_t expire)
715 struct stat st;
716 char *path;
717 int fd;
718 size_t len;
719 ssize_t read_result;
721 *wtpath = NULL;
722 if (!is_directory(git_path("worktrees/%s", id))) {
723 strbuf_addstr(reason, _("not a valid directory"));
724 return 1;
726 if (file_exists(git_path("worktrees/%s/locked", id)))
727 return 0;
728 if (stat(git_path("worktrees/%s/gitdir", id), &st)) {
729 strbuf_addstr(reason, _("gitdir file does not exist"));
730 return 1;
732 fd = open(git_path("worktrees/%s/gitdir", id), O_RDONLY);
733 if (fd < 0) {
734 strbuf_addf(reason, _("unable to read gitdir file (%s)"),
735 strerror(errno));
736 return 1;
738 len = xsize_t(st.st_size);
739 path = xmallocz(len);
741 read_result = read_in_full(fd, path, len);
742 if (read_result < 0) {
743 strbuf_addf(reason, _("unable to read gitdir file (%s)"),
744 strerror(errno));
745 close(fd);
746 free(path);
747 return 1;
749 close(fd);
751 if (read_result != len) {
752 strbuf_addf(reason,
753 _("short read (expected %"PRIuMAX" bytes, read %"PRIuMAX")"),
754 (uintmax_t)len, (uintmax_t)read_result);
755 free(path);
756 return 1;
758 while (len && (path[len - 1] == '\n' || path[len - 1] == '\r'))
759 len--;
760 if (!len) {
761 strbuf_addstr(reason, _("invalid gitdir file"));
762 free(path);
763 return 1;
765 path[len] = '\0';
766 if (!file_exists(path)) {
767 if (stat(git_path("worktrees/%s/index", id), &st) ||
768 st.st_mtime <= expire) {
769 strbuf_addstr(reason, _("gitdir file points to non-existent location"));
770 free(path);
771 return 1;
772 } else {
773 *wtpath = path;
774 return 0;
777 *wtpath = path;
778 return 0;
781 static int move_config_setting(const char *key, const char *value,
782 const char *from_file, const char *to_file)
784 if (git_config_set_in_file_gently(to_file, key, value))
785 return error(_("unable to set %s in '%s'"), key, to_file);
786 if (git_config_set_in_file_gently(from_file, key, NULL))
787 return error(_("unable to unset %s in '%s'"), key, from_file);
788 return 0;
791 int init_worktree_config(struct repository *r)
793 int res = 0;
794 int bare = 0;
795 struct config_set cs = { { 0 } };
796 const char *core_worktree;
797 char *common_config_file;
798 char *main_worktree_file;
801 * If the extension is already enabled, then we can skip the
802 * upgrade process.
804 if (repository_format_worktree_config)
805 return 0;
806 if ((res = git_config_set_gently("extensions.worktreeConfig", "true")))
807 return error(_("failed to set extensions.worktreeConfig setting"));
809 common_config_file = xstrfmt("%s/config", r->commondir);
810 main_worktree_file = xstrfmt("%s/config.worktree", r->commondir);
812 git_configset_init(&cs);
813 git_configset_add_file(&cs, common_config_file);
816 * If core.bare is true in the common config file, then we need to
817 * move it to the main worktree's config file or it will break all
818 * worktrees. If it is false, then leave it in place because it
819 * _could_ be negating a global core.bare=true.
821 if (!git_configset_get_bool(&cs, "core.bare", &bare) && bare) {
822 if ((res = move_config_setting("core.bare", "true",
823 common_config_file,
824 main_worktree_file)))
825 goto cleanup;
828 * If core.worktree is set, then the main worktree is located
829 * somewhere different than the parent of the common Git dir.
830 * Relocate that value to avoid breaking all worktrees with this
831 * upgrade to worktree config.
833 if (!git_configset_get_value(&cs, "core.worktree", &core_worktree)) {
834 if ((res = move_config_setting("core.worktree", core_worktree,
835 common_config_file,
836 main_worktree_file)))
837 goto cleanup;
841 * Ensure that we use worktree config for the remaining lifetime
842 * of the current process.
844 repository_format_worktree_config = 1;
846 cleanup:
847 git_configset_clear(&cs);
848 free(common_config_file);
849 free(main_worktree_file);
850 return res;