From: Junio C Hamano <gitster@pobox.com>
To: Yaroslav Nikitenko <metst13@gmail.com>
Cc: Felipe Contreras <felipe.contreras@gmail.com>, git@vger.kernel.org
Subject: Re: git-dir requires work-tree; documentation improvements for working directory
Date: Mon, 04 Jan 2021 15:47:06 -0800 [thread overview]
Message-ID: <xmqqmtxo464l.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: CA+RLzGArUrxC-Kbng3qGpRZUrZXKZj3zD3Hcut=XrUY-i-eYAw@mail.gmail.com
Yaroslav Nikitenko <metst13@gmail.com> writes:
> It starts to work when I remove my .cfg/config. I've no idea why it
> happens. Here is its contents:
>
> $ more .cfg/config
> [core]
> repositoryformatversion = 0
> filemode = true
> bare = true
As Felipe notes downthread, with "core.bare=true", the repository is
telling Git that it does not have a worktree. The "assume that $CWD
is the top of the worktree" default would have no room to kick in.
With --worktree=<there> option or GIT_WORK_TREE environment
variable, you can tell Git to pretend that there is a worktree there
at the specified location. Or perhaps "git -c core.bare=false", you
may be able to force the "assume that $CWD is the top of the worktree"
default to kick in.
"git help git" has this in --git-dir=<path>
Specifying the location of the ".git" directory using this
option (or `GIT_DIR` environment variable) turns off the
repository discovery that tries to find a directory with
".git" subdirectory (which is how the repository and the
top-level of the working tree are discovered), and tells Git
that you are at the top level of the working tree. If you
are not at the top-level directory of the working tree, you
should tell Git where the top-level of the working tree is,
with the `--work-tree=<path>` option (or `GIT_WORK_TREE`
environment variable)
but apparently the description forgets that there are repositories
with core.bare explicitly set to true. There is a room for doc
improvement here.
Perhaps something like this?
Documentation/git.txt | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git c/Documentation/git.txt w/Documentation/git.txt
index c463b937a8..6f8225e3ef 100644
--- c/Documentation/git.txt
+++ w/Documentation/git.txt
@@ -118,12 +118,15 @@ Specifying the location of the ".git" directory using this
option (or `GIT_DIR` environment variable) turns off the
repository discovery that tries to find a directory with
".git" subdirectory (which is how the repository and the
-top-level of the working tree are discovered), and tells Git
-that you are at the top level of the working tree. If you
-are not at the top-level directory of the working tree, you
-should tell Git where the top-level of the working tree is,
+top-level of the working tree are discovered), and if the
+repository has a working tree, i.e. `core.bare` is `false`,
+tells Git that you are at the top level of the working tree. If you
+are not at the top-level directory of the working tree, or
+if `core.bare` is set to `true` and you are trying to pretend
+there is a working tree associated with the repository, you
+can tell Git where the top-level of the working tree is,
with the `--work-tree=<path>` option (or `GIT_WORK_TREE`
-environment variable)
+environment variable).
+
If you just want to run git as if it was started in `<path>` then use
`git -C <path>`.
prev parent reply other threads:[~2021-01-04 23:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-02 14:40 git-dir requires work-tree; documentation improvements for working directory Yaroslav Nikitenko
2021-01-02 19:12 ` Felipe Contreras
2021-01-02 19:44 ` Yaroslav Nikitenko
2021-01-02 22:02 ` Felipe Contreras
2021-01-03 9:12 ` Yaroslav Nikitenko
2021-01-03 11:57 ` Felipe Contreras
2021-01-04 23:47 ` Junio C Hamano [this message]
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=xmqqmtxo464l.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=metst13@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).