From: Sergey Organov <sorganov@gmail.com>
To: Tao Klerks <tao@klerks.biz>
Cc: Junio C Hamano <gitster@pobox.com>,
Kristoffer Haugsbakk <code@khaugsbakk.name>,
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>
Subject: Re: Is "bare"ness in the context of multiple worktrees weird? Bitmap error in git gc.
Date: Thu, 07 Sep 2023 09:33:24 +0300 [thread overview]
Message-ID: <87h6o6ebm3.fsf@osv.gnss.ru> (raw)
In-Reply-To: <CAPMMpojTLswqubRk0Ly3RQqkrnpx_9Hiu_TRK1=ASPbPNz4ApQ@mail.gmail.com> (Tao Klerks's message of "Thu, 7 Sep 2023 06:53:58 +0200")
Tao Klerks <tao@klerks.biz> writes:
> On Wed, Sep 6, 2023 at 10:26 PM Junio C Hamano <gitster@pobox.com> 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.
>>
>> 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've definitely changed my mind about "inline", I agree "main" is
> better. I'm not convinced it's the best word we could come up with,
> but if it's well-established, I'm happy with it.
>
> The problem I (now) see with "inline" is that it seems to imply a
> spatial proximity that doesn't necessarily hold true, with
> "--separate-git-dir" or other ways to separate the main worktree from
> its usual "just above the .git directory" location. "Inline" is still
> a reasonable qualification of the main worktree's *metadata* in that
> situation (index, etc), but I think the word would not be sufficiently
> clear/representative overall.
It's not to argue in favor of "inline", just to clarify: I took it from
inline-vs-attached as used in e-mail, where "inline" means that you see
attachment right here, inline with the rest of text.
I also admit I didn't happen to consider --separate-git-dir at the
time.
next prev parent reply other threads:[~2023-09-07 17:41 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 [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87h6o6ebm3.fsf@osv.gnss.ru \
--to=sorganov@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=code@khaugsbakk.name \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.