Re: Is "bare"ness in the context of multiple worktrees weird? Bitmap error in git gc.
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 6, 2023, 20:26 UTC
- Message-ID
- <xmqqledjm4k2.fsf@gitster.g>
- In-Reply-To
- <CAPMMpohgkH3h1zC_Q7O-07gYw8_7mdSsyX7vu1K1u5+CxKUaUQ@mail.gmail.com>
Tao Klerks <tao@klerks.biz> writes:
> I like the nomenclature, I like the simple "zero (i.e. bare) or one > inline worktree, zero or more attached worktrees" explanation.
We have used "main worktree" to refer to the working tree part (plus the repository) of a non-bare repository. And it makes sense to explain it together with the concept of "worktree", as the primary one is very much special in that it cannot be removed. You can see that "git worktree remove" would stop you from removing it with an error message:
fatal: '../there' is a main working tree.
It probably does not add much value to introduce a new term "inline". Here is what "git worktree --help" has to say about it.
A repository has one main worktree (if it's not a bare repository) and
zero or more linked worktrees.I applaud whoever wrote this sentence for packing so much good information in a concise and easy-to-understand description.
We can read that (1) a non-bare repository itself is considered its "main worktree", (2) a bare repository, by inference, has no main worktree (otherwise we wouldn't have said "if it's not"), and (3) both bare and non-bare repositories can have linked worktrees (again, otherwise we wouldn't have brought up a bare repository in the description).
Perhaps we should borrow it to update the glossary, like so?
Documentation/glossary-content.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git c/Documentation/glossary-content.txt w/Documentation/glossary-content.txt index 5a537268e2..d9ba3bab88 100644 --- c/Documentation/glossary-content.txt +++ w/Documentation/glossary-content.txt @@ -694,8 +694,8 @@ The most notable example is `HEAD`. plus any local changes that you have made but not yet committed. [[def_worktree]]worktree:: - A repository can have zero (i.e. bare repository) or one or - more worktrees attached to it. One "worktree" consists of a + A repository has one main worktree (if it's not a bare + repository) and zero or more linked worktrees. One "worktree" consists of a "working tree" and repository metadata, most of which are shared among other worktrees of a single repository, and some of which are maintained separately per worktree