summaryrefslogtreecommitdiff
path: root/builtin/annotate.c
diff options
context:
space:
mode:
authorLibravatar Eric Sunshine <sunshine@sunshineco.com>2020-08-31 02:57:57 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-08-31 11:47:45 -0700
commitbdd1f3e4da716012a52194cdfbc9c80dfdce87d4 (patch)
tree4a54786205851b904bcbdf55b67d4678f97db6d9 /builtin/annotate.c
parentworktree: add skeleton "repair" command (diff)
downloadtgif-bdd1f3e4da716012a52194cdfbc9c80dfdce87d4.tar.xz
worktree: teach "repair" to fix worktree back-links to main worktree
The .git file in a linked worktree is a "gitfile" which points back to the .git/worktrees/<id> entry in the main worktree or bare repository. If a worktree's .git file is deleted or becomes corrupted or outdated, then the linked worktree won't know how to find the repository or any of its own administrative files (such as 'index', 'HEAD', etc.). An easy way for the .git file to become outdated is for the user to move the main worktree or bare repository. Although it is possible to manually update each linked worktree's .git file to reflect the new repository location, doing so requires a level of knowledge about worktree internals beyond what a user should be expected to know offhand. Therefore, teach "git worktree repair" how to repair broken or outdated worktree .git files automatically. (For this to work, the command must be invoked from within the main worktree or bare repository, or from within a worktree which has not become disconnected from the repository -- such as one which was created after the repository was moved.) Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/annotate.c')
0 files changed, 0 insertions, 0 deletions