From: Jeff King <peff@peff.net>
To: Duy Nguyen <pclouds@gmail.com>
Cc: Bert Wesarg <bert.wesarg@googlemail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: includeIf breaks calling dashed externals
Date: Sun, 16 Apr 2017 00:50:04 -0400 [thread overview]
Message-ID: <20170416045004.2ghhiv7jzgroejgw@sigill.intra.peff.net> (raw)
In-Reply-To: <20170415114901.GA5727@ash>
On Sat, Apr 15, 2017 at 06:49:01PM +0700, Duy Nguyen wrote:
> > Probably this fixes it:
> >
> > diff --git a/config.c b/config.c
> > index b6e4a57b9..8d66bdf56 100644
> > --- a/config.c
> > +++ b/config.c
> > @@ -213,6 +213,9 @@ static int include_by_gitdir(const char *cond, size_t cond_len, int icase)
> > struct strbuf pattern = STRBUF_INIT;
> > int ret = 0, prefix;
> >
> > + if (!have_git_dir())
> > + return 0;
> > +
> > strbuf_add_absolute_path(&text, get_git_dir());
> > strbuf_add(&pattern, cond, cond_len);
> > prefix = prepare_include_condition_pattern(&pattern);
> >
> > But it does raise a question of reading config before/after repository
> > setup, since those will give different answers. I guess they do anyway
> > because of $GIT_DIR/config.
>
> This happens in execv_dased_external() -> check_pager_config() ->
> read_early_config(). We probably could use the same discover_git_directory
> trick to get .git dir (because we should find it). Maybe something
> like this instead?
I know that we only kick in discover_git_directory() in certain cases
when we're reading config (for the "early config"). Would it makes sense
to respect the same rules here?
I.e., if we have a program that wants to look at config but explicitly
_doesn't_ setup the git repository, is it right to say that we are
inside that repository?
So instead of lazily doing the discovery here:
> diff --git a/config.c b/config.c
> index 1a4d85537b..4f540ae578 100644
> --- a/config.c
> +++ b/config.c
> @@ -212,8 +212,14 @@ static int include_by_gitdir(const char *cond, size_t cond_len, int icase)
> struct strbuf text = STRBUF_INIT;
> struct strbuf pattern = STRBUF_INIT;
> int ret = 0, prefix;
> + struct strbuf gitdir = STRBUF_INIT;
>
> - strbuf_add_absolute_path(&text, get_git_dir());
> + if (have_git_dir())
> + strbuf_addstr(&gitdir, get_git_dir());
> + else if (!discover_git_directory(&gitdir))
> + goto done;
..should we record the discovered git dir in read_early_config(), and
use it only if available? And if not, then we know the program is
explicitly trying not to be in a repo (or we know we tried to discover
one already and it didn't exist).
-Peff
next prev parent reply other threads:[~2017-04-16 4:50 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-14 17:04 includeIf breaks calling dashed externals Bert Wesarg
2017-04-14 17:43 ` Jeff King
2017-04-15 11:49 ` Duy Nguyen
2017-04-16 4:50 ` Jeff King [this message]
2017-04-16 10:41 ` [PATCH 1/2] config: prepare to pass more info in git_config_with_options() Nguyễn Thái Ngọc Duy
2017-04-16 10:41 ` [PATCH 2/2] config: handle conditional include when $GIT_DIR is not set up Nguyễn Thái Ngọc Duy
2017-04-16 15:51 ` Jeff King
2017-04-17 2:13 ` Duy Nguyen
2017-04-18 3:56 ` Jeff King
2017-04-17 10:07 ` Duy Nguyen
2017-04-17 10:10 ` [PATCH v2 1/3] config: prepare to pass more info in git_config_with_options() Nguyễn Thái Ngọc Duy
2017-04-17 10:10 ` [PATCH v2 2/3] config: handle conditional include when $GIT_DIR is not set up Nguyễn Thái Ngọc Duy
2017-04-18 2:49 ` Junio C Hamano
2017-04-18 2:56 ` Junio C Hamano
2017-04-18 3:46 ` Jeff King
2017-04-17 10:10 ` [PATCH v2 3/3] config: correct file reading order in read_early_config() Nguyễn Thái Ngọc Duy
2017-04-18 3:53 ` Jeff King
2017-04-18 2:27 ` [PATCH v2 1/3] config: prepare to pass more info in git_config_with_options() Junio C Hamano
2017-04-18 3:55 ` Jeff King
2017-04-18 4:51 ` Junio C Hamano
2017-04-18 3:17 ` [PATCH 2/2] config: handle conditional include when $GIT_DIR is not set up Junio C Hamano
2017-04-18 4:03 ` Jeff King
2017-04-16 15:31 ` [PATCH 1/2] config: prepare to pass more info in git_config_with_options() Jeff King
2017-04-17 1:42 ` 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=20170416045004.2ghhiv7jzgroejgw@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
--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).