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 /git-mergetool.sh | |
| parent | worktree: teach "repair" to fix outgoing links to worktrees (diff) | |
| download | tgif-42264bc841d416aab5a980cb4eeedf687f1190a5.tar.xz | |
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 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions