From: Sergey Organov <sorganov@gmail.com>
To: "Kristoffer Haugsbakk" <code@khaugsbakk.name>
Cc: "Eric Sunshine" <sunshine@sunshineco.com>,
"Tao Klerks" <tao@klerks.biz>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Taylor Blau" <me@ttaylorr.com>, "Patrick Steinhardt" <ps@pks.im>,
git <git@vger.kernel.org>
Subject: Re: Is "bare"ness in the context of multiple worktrees weird? Bitmap error in git gc.
Date: Wed, 06 Sep 2023 19:39:27 +0300 [thread overview]
Message-ID: <87edjbuugw.fsf@osv.gnss.ru> (raw)
In-Reply-To: <2ba66542-9ae2-4b13-ae6b-f37dec6b72c7@app.fastmail.com> (Kristoffer Haugsbakk's message of "Wed, 06 Sep 2023 18:00:26 +0200")
"Kristoffer Haugsbakk" <code@khaugsbakk.name> writes:
[...]
> -- >8 --
> Subject: [PATCH] Try to reword what a worktree is
>
> ---
> Documentation/glossary-content.txt | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
> index 5a537268e2..5e192fb5dc 100644
> --- a/Documentation/glossary-content.txt
> +++ b/Documentation/glossary-content.txt
> @@ -694,10 +694,14 @@ 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
> + A repository can have zero or one or
> more worktrees attached to it. 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
> (e.g. the index, HEAD and pseudorefs like MERGE_HEAD,
> per-worktree refs and per-worktree configuration file).
> ++
> +Note that the directory tree of a <<def_bare_repository,bare_repository>>
> +may have linked worktrees, but cannot itself be a worktree since it has no
> +working tree.
Reading this with a fresh eye, I wonder if we'd better distinguish
between "inline" worktree and "attached" worktrees?
As I see it, in fact a repository can have zero (i.e. bare repository)
or one inline worktree, as well as zero or more attached worktrees.
--
Sergey Organov
next prev parent reply other threads:[~2023-09-06 16:39 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-04 14:41 Is "bare"ness in the context of multiple worktrees weird? Bitmap error in git gc Tao Klerks
2023-09-04 14:59 ` Tao Klerks
2023-09-04 15:29 ` Tao Klerks
2023-09-04 17:42 ` Kristoffer Haugsbakk
2023-09-04 17:56 ` Kristoffer Haugsbakk
2023-09-05 0:38 ` Eric Sunshine
2023-09-06 16:00 ` Kristoffer Haugsbakk
2023-09-06 16:39 ` Sergey Organov [this message]
2023-09-06 17:59 ` Kristoffer Haugsbakk
2023-09-06 18:04 ` Tao Klerks
2023-09-06 20:26 ` Junio C Hamano
2023-09-06 22:00 ` Sergey Organov
2023-09-06 22:15 ` Junio C Hamano
2023-09-06 22:34 ` Sergey Organov
2023-09-07 4:53 ` Tao Klerks
2023-09-07 6:33 ` Sergey Organov
2023-09-07 20:11 ` Kristoffer Haugsbakk
2023-09-07 15:07 ` Kristoffer Haugsbakk
2023-09-07 18:23 ` Junio C Hamano
2023-09-06 17:52 ` Junio C Hamano
2023-09-06 18:08 ` Kristoffer Haugsbakk
2023-09-06 19:10 ` Junio C Hamano
2023-09-06 22:11 ` Sergey Organov
2023-09-05 15:48 ` Tao Klerks
2023-09-05 0:26 ` Eric Sunshine
2023-09-05 1:09 ` Junio C Hamano
2023-09-05 5:43 ` Eric Sunshine
2023-09-05 15:13 ` Junio C Hamano
2023-09-05 16:25 ` Tao Klerks
2023-09-06 17:29 ` Kristoffer Haugsbakk
2023-09-05 16:10 ` Tao Klerks
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87edjbuugw.fsf@osv.gnss.ru \
--to=sorganov@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=code@khaugsbakk.name \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.com \
--cc=ps@pks.im \
--cc=sunshine@sunshineco.com \
--cc=tao@klerks.biz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).