From: Jeff King <peff@peff.net>
To: Brandon Williams <bmwill@google.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH 4/4] config: don't implicitly use gitdir
Date: Tue, 13 Jun 2017 03:08:14 -0400 [thread overview]
Message-ID: <20170613070813.v3vthqlqsga7djgz@sigill.intra.peff.net> (raw)
In-Reply-To: <20170613061627.GJ154599@google.com>
On Mon, Jun 12, 2017 at 11:16:27PM -0700, Brandon Williams wrote:
> > > *puzzled* Why wasn't this needed before, then? The rest of the patch
> > > should result in no functional change, but this part seems different.
> >
> > Now I'm puzzled, too. The original that got filled in lazily by the
> > config functions was always get_git_dir(). I can buy the argument that
> > this was a bug (I'm not familiar enough with worktree to say one way or
> > the other), but if it's a fix it should definitely go into another
> > patch.
>
> Well actually... in do_git_config_sequence 'git_path("config")' is
> called which will convert gitdir to commondir under the hood. you can't
> use vanilla gitdir because the config isn't stored in a worktree's
> gitdir but rather in the commondir as the config is shared by all
> worktrees.
Sorry, I missed the fact that there were two sites changed on the first
read.
> So maybe we actually need to add a field to the 'config_options' struct
> of 'commondir' such that the commondir can be used to load the actual
> config file and 'gitdir' can be used to handle the 'IncludeIf' stuff.
On reflection, I suspect that probably is the case. If you have a
workdir in ~/foo, you probably want to match IncludeIf against that
instead of wherever the common dir happens to be.
-Peff
next prev parent reply other threads:[~2017-06-13 7:08 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-12 21:34 [PATCH 0/4] config.h Brandon Williams
2017-06-12 21:34 ` [PATCH 1/4] config: create config.h Brandon Williams
2017-06-12 21:34 ` [PATCH 2/4] config: remove git_config_iter Brandon Williams
2017-06-13 0:49 ` Jonathan Nieder
2017-06-13 0:57 ` Jeff King
2017-06-12 21:34 ` [PATCH 3/4] config: don't include config.h by default Brandon Williams
2017-06-12 21:34 ` [PATCH 4/4] config: don't implicitly use gitdir Brandon Williams
2017-06-13 1:05 ` Jonathan Nieder
2017-06-13 1:23 ` Brandon Williams
2017-06-13 1:33 ` Jonathan Nieder
2017-06-13 1:38 ` Jonathan Nieder
2017-06-13 2:59 ` Jeff King
2017-06-13 6:16 ` Brandon Williams
2017-06-13 6:45 ` Jeff King
2017-06-13 7:08 ` Jeff King [this message]
2017-06-13 14:43 ` Brandon Williams
2017-06-13 17:06 ` Jonathan Nieder
2017-06-13 5:52 ` Brandon Williams
2017-06-13 6:29 ` Jeff King
2017-06-13 14:47 ` Brandon Williams
2017-06-12 21:45 ` [PATCH 0/4] config.h Jeff King
2017-06-12 21:53 ` Brandon Williams
2017-06-12 22:02 ` Jeff King
2017-06-12 22:06 ` Brandon Williams
2017-06-13 1:07 ` Jonathan Nieder
2017-06-13 21:03 ` [PATCH v2 0/6] config.h Brandon Williams
2017-06-13 21:03 ` [PATCH v2 1/6] config: create config.h Brandon Williams
2017-06-13 21:13 ` Jonathan Nieder
2017-06-13 21:03 ` [PATCH v2 2/6] config: remove git_config_iter Brandon Williams
2017-06-13 21:14 ` Jonathan Nieder
2017-06-13 21:03 ` [PATCH v2 3/6] config: don't include config.h by default Brandon Williams
2017-06-13 21:58 ` Jonathan Nieder
2017-06-13 21:03 ` [PATCH v2 4/6] config: don't implicitly use gitdir Brandon Williams
2017-06-13 21:08 ` Jonathan Nieder
2017-06-13 21:38 ` Brandon Williams
2017-06-13 21:51 ` Jonathan Nieder
2017-06-13 21:55 ` Junio C Hamano
2017-06-13 22:05 ` Jonathan Nieder
2017-06-14 4:40 ` Jacob Keller
2017-06-14 6:25 ` Jeff King
2017-06-14 17:14 ` Brandon Williams
2017-06-13 21:03 ` [PATCH v2 5/6] setup: teach discover_git_directory to respect the commondir Brandon Williams
2017-06-14 6:15 ` Jeff King
2017-06-14 17:19 ` Brandon Williams
2017-06-13 21:03 ` [PATCH v2 6/6] config: respect commondir Brandon Williams
2017-06-14 18:07 ` [PATCH v3 0/6] config.h Brandon Williams
2017-06-14 18:07 ` [PATCH v3 1/6] config: create config.h Brandon Williams
2017-06-14 18:07 ` [PATCH v3 2/6] config: remove git_config_iter Brandon Williams
2017-06-14 18:07 ` [PATCH v3 3/6] config: don't include config.h by default Brandon Williams
2017-06-14 18:07 ` [PATCH v3 4/6] setup: teach discover_git_directory to respect the commondir Brandon Williams
2017-06-14 18:07 ` [PATCH v3 5/6] config: respect commondir Brandon Williams
2017-06-14 18:07 ` [PATCH v3 6/6] config: don't implicitly use gitdir or commondir Brandon Williams
2017-06-15 19:59 ` [PATCH v3 0/6] config.h Junio C Hamano
2017-06-15 20:33 ` Brandon Williams
2017-06-15 21:09 ` Junio C Hamano
2017-06-15 21:18 ` Brandon Williams
2017-06-16 0:12 ` Brandon Williams
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=20170613070813.v3vthqlqsga7djgz@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@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).