From: Jeff Hostetler <git@jeffhostetler.com>
To: Jeff King <peff@peff.net>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2 1/1] config: work around bug with includeif:onbranch and early config
Date: Thu, 1 Aug 2019 13:24:17 -0400 [thread overview]
Message-ID: <7f4257d3-5ae0-3a83-84f1-bee83682fa36@jeffhostetler.com> (raw)
In-Reply-To: <20190801004928.GA6351@sigill.intra.peff.net>
On 7/31/2019 8:49 PM, Jeff King wrote:
> On Wed, Jul 31, 2019 at 07:12:57PM -0400, Jeff King wrote:
>
>> Hrm. But common-main calls initialize_the_repository(), which points it
>> at &the_repo. And I can't find any other assignments. So how does it
>> become NULL? And is every caller of have_git_dir() at risk of
>> segfaulting?
>>
>> Ah, I see. I think it is that trace2 reads the configuration very early.
>> I think we ought to do this:
>>
>> diff --git a/common-main.c b/common-main.c
>> index 582a7b1886..89fd415e55 100644
>> --- a/common-main.c
>> +++ b/common-main.c
>> @@ -39,14 +39,14 @@ int main(int argc, const char **argv)
>>
>> git_resolve_executable_dir(argv[0]);
>>
>> + initialize_the_repository();
>> +
>> trace2_initialize();
>> trace2_cmd_start(argv);
>> trace2_collect_process_info(TRACE2_PROCESS_INFO_STARTUP);
>>
>> git_setup_gettext();
>>
>> - initialize_the_repository();
>> -
>> attr_start();
>>
>> result = cmd_main(argc, argv);
>
> By the way, I wondered why trace2's existing config reading did not
> cause us to segfault because of this. It is because it invented the
> "very early config" function which always ignores some config sources
> (working around this problem, but also making it weirdly unlike most
> other config).
Yes, I added the "very early config" to try to work around some of
the chicken-n-egg problems. I can't say that I was completely happy
with having to do that. I haven't had time to play with your patch
suggestion here, but I think it would be fine to do if it will help
with the original problem.
In [1] I added code to just start the clock in isolation (rather than
being part of the trace2_initialize() -- which does all the config
loading and subsystem initialization). So it is OK to let the
trace2_initialize() run a little later. (Part of the reason for that
split was to allow git_resolve_executable_dir() to run first, since
that data was needed to find the location of the system config relative
to the exe path (sigh).)
[1] a089724958a trace2: refactor setting process starting time
So, as you suggested in your previous response, something like
this would/should be fine.
$ git diff
diff --git a/common-main.c b/common-main.c
index 582a7b1886..71e21dd20a 100644
--- a/common-main.c
+++ b/common-main.c
@@ -39,16 +39,16 @@ int main(int argc, const char **argv)
git_resolve_executable_dir(argv[0]);
- trace2_initialize();
- trace2_cmd_start(argv);
- trace2_collect_process_info(TRACE2_PROCESS_INFO_STARTUP);
-
git_setup_gettext();
initialize_the_repository();
attr_start();
+ trace2_initialize();
+ trace2_cmd_start(argv);
+ trace2_collect_process_info(TRACE2_PROCESS_INFO_STARTUP);
+
result = cmd_main(argc, argv);
trace2_cmd_exit(result);
next prev parent reply other threads:[~2019-08-01 17:24 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-31 19:53 [PATCH 0/1] Make the includeif:onbranch feature more robust Johannes Schindelin via GitGitGadget
2019-07-31 19:53 ` [PATCH 1/1] config: work around bug with includeif:onbranch and early config Johannes Schindelin via GitGitGadget
2019-07-31 21:37 ` Junio C Hamano
2019-07-31 20:06 ` [PATCH v2 0/1] Make the includeif:onbranch feature more robust Johannes Schindelin via GitGitGadget
2019-07-31 20:06 ` [PATCH v2 1/1] config: work around bug with includeif:onbranch and early config Johannes Schindelin via GitGitGadget
2019-07-31 22:02 ` Jeff King
2019-07-31 22:13 ` Johannes Schindelin
2019-07-31 23:12 ` Jeff King
2019-08-01 0:49 ` Jeff King
2019-08-01 17:24 ` Jeff Hostetler [this message]
2019-08-06 12:26 ` [PATCH 0/3] the_repository initialization cleanup Jeff King
2019-08-06 12:26 ` [PATCH 1/3] t1309: use short branch name in includeIf.onbranch test Jeff King
2019-08-06 12:27 ` [PATCH 2/3] common-main: delay trace2 initialization Jeff King
2019-08-06 12:27 ` [PATCH 3/3] config: stop checking whether the_repository is NULL Jeff King
2019-08-06 12:49 ` Jeff King
2019-08-08 19:48 ` Johannes Schindelin
2019-08-06 12:56 ` [PATCH v2 1/1] config: work around bug with includeif:onbranch and early config Jeff King
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=7f4257d3-5ae0-3a83-84f1-bee83682fa36@jeffhostetler.com \
--to=git@jeffhostetler.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).