From: "Kristoffer Haugsbakk" <code@khaugsbakk.name>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: "Sergey Organov" <sorganov@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Taylor Blau" <me@ttaylorr.com>, "Patrick Steinhardt" <ps@pks.im>,
git <git@vger.kernel.org>, "Tao Klerks" <tao@klerks.biz>
Subject: Re: Is "bare"ness in the context of multiple worktrees weird? Bitmap error in git gc.
Date: Thu, 07 Sep 2023 17:07:01 +0200 [thread overview]
Message-ID: <d59a97e7-81fd-472b-9a18-32d993f8c1c8@app.fastmail.com> (raw)
In-Reply-To: <xmqqledjm4k2.fsf@gitster.g>
Hi again Junio
On Wed, Sep 6, 2023, at 22:26, Junio C Hamano wrote:
> 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.
This gives the same error if `there` is a bare repository. Is that
intended?
This goes back to my point about missing nomenclature: it's weird if the
“main working tree” can be a bare repository.
PS: Is it correct that the error message says “main working tree” instead
of “main worktree”? (See cc73385cf6 (worktree remove: new command,
2018-02-12.) I was thinking of spelunking the history further but thought
that I would quickly ask in case I'm missing something obvious.
> It probably does not add much value to introduce a new term
> "inline".
The reason that I like it is because it lets you describe a bare
repository with linked worktrees. Not because it would replace “main
worktree”.
Although in light of Sergey's post about inline/attached, the “main
worktree” term *might* start to look a bit anachronistic. But I'm not
sure.
> 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.
I agree that it is very elegant.
> Perhaps we should borrow it to update the glossary, like so?
Certainly. But although this looks like it completely describes everything
that you want, I still think it is good to explicitly mention something
like:
“ Note that a bare repository may have ...
Since although this can certainly be inferred from the text, it's good to
have some redundancy when it comes to non-obvious cases.
Cheers
--
Kristoffer Haugsbakk
next prev parent reply other threads:[~2023-09-07 16:17 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
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 [this message]
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=d59a97e7-81fd-472b-9a18-32d993f8c1c8@app.fastmail.com \
--to=code@khaugsbakk.name \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.com \
--cc=ps@pks.im \
--cc=sorganov@gmail.com \
--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).