diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2020-08-31 02:57:59 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-31 11:47:45 -0700 |
| commit | 42264bc841d416aab5a980cb4eeedf687f1190a5 (patch) | |
| tree | 637581d0c237af428efb6b6bb110e7dc663e6d70 /builtin/init-db.c | |
| parent | b214ab5aa597e748c228e657d4eb7c18960e6a67 (diff) | |
| download | git-42264bc841d416aab5a980cb4eeedf687f1190a5.tar.gz | |
init: teach --separate-git-dir to repair linked worktrees
A linked worktree's .git file is a "gitfile" pointing at the
.git/worktrees/<id> directory within the repository. When `git init
--separate-git-dir=<path>` is used on an existing repository to relocate
the repository's .git/ directory to a different location, it neglects to
update the .git files of linked worktrees, thus breaking the worktrees
by making it impossible for them to locate the repository. Fix this by
teaching --separate-git-dir to repair the .git file of each linked
worktree to point at the new repository location.
Reported-by: Henré Botha <henrebotha@gmail.com>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/init-db.c')
| -rw-r--r-- | builtin/init-db.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/init-db.c b/builtin/init-db.c index bbc9bc78f9..7b915d88ab 100644 --- a/builtin/init-db.c +++ b/builtin/init-db.c @@ -9,6 +9,7 @@ #include "builtin.h" #include "exec-cmd.h" #include "parse-options.h" +#include "worktree.h" #ifndef DEFAULT_GIT_TEMPLATE_DIR #define DEFAULT_GIT_TEMPLATE_DIR "/usr/share/git-core/templates" @@ -364,6 +365,7 @@ static void separate_git_dir(const char *git_dir, const char *git_link) if (rename(src, git_dir)) die_errno(_("unable to move %s to %s"), src, git_dir); + repair_worktrees(NULL, NULL); } write_file(git_link, "gitdir: %s", git_dir); |