From: Stefan Beller <sbeller@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Duy Nguyen <pclouds@gmail.com>,
Jonathan Nieder <jrnieder@gmail.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [PATCH] Documentation/git-worktree: use working tree for trees on the file system
Date: Mon, 20 Mar 2017 10:29:56 -0700 [thread overview]
Message-ID: <CAGZ79kayeSxFTJr3Q1atFgOyR74PzQyCLiejuZxh7+wTGGb=ww@mail.gmail.com> (raw)
In-Reply-To: <xmqq60j75psk.fsf@gitster.mtv.corp.google.com>
On Fri, Mar 17, 2017 at 6:36 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Stefan Beller <sbeller@google.com> writes:
>
>> -List details of each worktree. The main worktree is listed first, followed by
>> -each of the linked worktrees. The output details include if the worktree is
>> -bare, the revision currently checked out, and the branch currently checked out
>> -(or 'detached HEAD' if none).
>> +List details of each working tree. The main working tree is listed first,
>> +followed by each of the linked working trees. The output details include if
>> +the working tree is bare, the revision currently checked out, and the branch
>> +currently checked out (or 'detached HEAD' if none).
>
> I do not think this is correct.
>
> Think of a "worktree" something that roughly corresponds to
> different location you can refer to with $GIT_DIR.
>
> A $GIT_DIR may be a true repository. Or it may be borrowing many of
> the things from its primary repository. Even though "git worktree"
> Porcelain may not currently be equipped to create a "bare" $GIT_DIR,
> there is no fundamental reason that a secondary "worktree" must have
> a working tree, i.e. a "worktree" could be a "bare" one (it would be
> the first use of per-worktree config; a secondary worktree that is a
> bare can be made by borrowing from the primary worktree that has a
> working tree).
While it may be true that you can have bare worktrees; I would question
why anyone wants to do this, as the only thing it provides is an
additional HEAD (plus its reflog).
> Now, what does "git worktree list" enumearate? It does not list
> "working trees"; its output are list of things, each of which you
> could point at with $GIT_DIR and work with.
$ git worktree list
/.../git 0b47ebba82 [status-short]
/.../git_origin_master 5588dbffbd (detached HEAD)
/.../submodule_remote_dot 3d9025bd69 (detached HEAD)
This looks to me as if it is listing actual working trees. But looking
at the actual code, I confirm we list worktrees here, even bare
worktrees are taken care of.
That said, "worktree prune" (as well as (un)lock) are operating
on "worktrees" as you defined above:
$ git worktree add test
$ git worktree list
# see the "test" worktree listed by its working tree
rm -rf test # remove the working tree attached to the test worktree
$ git worktree list
# see the "test" worktree listed by its working tree, still there
$ git worktree prune
$ git worktree list
# the "test" worktree is gone.
So maybe we need a patch that is s/working tree/worktree/
in the prune section?
Thanks,
Stefan
next prev parent reply other threads:[~2017-03-20 17:37 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-30 20:44 [PATCH 0/4] git-prompt.sh: Full patch for submodule indicator Benjamin Fuchs
2017-01-30 20:44 ` [PATCH 1/4] git-prompt.sh: add " Benjamin Fuchs
2017-01-30 23:48 ` Junio C Hamano
2017-01-31 0:10 ` Benjamin Fuchs
2017-01-31 3:11 ` Junio C Hamano
2017-02-06 4:23 ` Stefan Beller
2017-02-06 5:55 ` Jacob Keller
2017-02-06 10:13 ` Stefan Beller
2017-01-30 20:44 ` [PATCH 2/4] git-prompt.sh: rework of " Benjamin Fuchs
2017-01-31 18:06 ` SZEDER Gábor
2017-01-30 20:44 ` [PATCH 3/4] git-prompt.sh: fix for submodule 'dirty' indicator Benjamin Fuchs
2017-01-30 20:44 ` [PATCH 4/4] git-prompt.sh: add tests for submodule indicator Benjamin Fuchs
2017-01-31 18:32 ` SZEDER Gábor
2017-01-31 22:06 ` Junio C Hamano
2017-01-31 22:12 ` Stefan Beller
2017-03-07 3:45 ` [RFC PATCH] rev-parse: add --show-superproject-working-tree Stefan Beller
2017-03-07 5:13 ` Junio C Hamano
2017-03-07 7:16 ` Junio C Hamano
2017-03-07 7:23 ` Junio C Hamano
2017-03-07 18:44 ` Junio C Hamano
2017-03-07 20:40 ` Stefan Beller
2017-03-07 22:49 ` Junio C Hamano
2017-03-08 0:56 ` [PATCHv2] " Stefan Beller
2017-03-08 1:30 ` Junio C Hamano
2017-03-08 6:01 ` Junio C Hamano
2017-03-08 19:20 ` [PATCHv3] " Stefan Beller
2017-03-08 22:28 ` Junio C Hamano
2017-03-08 23:07 ` [PATCHv4] " Stefan Beller
2017-03-08 23:51 ` Junio C Hamano
2017-03-17 22:28 ` Jonathan Nieder
2017-03-17 22:51 ` [PATCH] Documentation/git-worktree: use working tree for trees on the file system Stefan Beller
2017-03-17 22:55 ` Jonathan Nieder
2017-03-17 23:04 ` Stefan Beller
2017-03-18 17:24 ` Junio C Hamano
2017-03-18 1:47 ` Junio C Hamano
2017-03-18 1:36 ` Junio C Hamano
2017-03-20 17:29 ` Stefan Beller [this message]
2017-03-20 18:12 ` Junio C Hamano
2017-03-20 18:50 ` Jonathan Nieder
2017-03-20 19:22 ` [PATCH 0/2] use "working trees" instead of "worktree" in our API Stefan Beller
2017-03-20 19:22 ` [PATCH 1/2] git.c: introduce --working-tree superseding --work-tree Stefan Beller
2017-03-20 19:58 ` Jonathan Nieder
2017-03-20 19:22 ` [PATCH 2/2] revparse: introduce --is-inside-working-tree Stefan Beller
2017-03-20 20:00 ` Jonathan Nieder
2017-03-20 19:37 ` [PATCH 0/2] use "working trees" instead of "worktree" in our API Junio C Hamano
2017-03-21 10:37 ` [PATCH] Documentation/git-worktree: use working tree for trees on the file system Duy Nguyen
2017-03-21 15:48 ` Junio C Hamano
2017-03-23 17:06 ` Michael J Gruber
2017-03-23 17:55 ` Junio C Hamano
2017-03-25 12:07 ` Duy Nguyen
2017-04-07 13:59 ` Michael J Gruber
2017-04-07 16:14 ` Jacob Keller
2017-03-25 12:05 ` Duy Nguyen
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='CAGZ79kayeSxFTJr3Q1atFgOyR74PzQyCLiejuZxh7+wTGGb=ww@mail.gmail.com' \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=pclouds@gmail.com \
/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).