From: Jeff King <peff@peff.net>
To: Jeff Hostetler <git@jeffhostetler.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 0/3] the_repository initialization cleanup
Date: Tue, 6 Aug 2019 08:26:02 -0400 [thread overview]
Message-ID: <20190806122601.GA21475@sigill.intra.peff.net> (raw)
In-Reply-To: <7f4257d3-5ae0-3a83-84f1-bee83682fa36@jeffhostetler.com>
On Thu, Aug 01, 2019 at 01:24:17PM -0400, Jeff Hostetler wrote:
> > 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.
Thanks, that pointer helped me write the commit message. So here are a
few cleanups that can go on top (of master now, since Dscho's patch
graduated). There's no rush to get these into v2.23.
Note that there _is_ still a funny corner case with the way the original
patch checks the_repository->git_dir, but I don't think it's worth
fixing at this point. I'll send a followup email with more details.
[1/3]: t1309: use short branch name in includeIf.onbranch test
[2/3]: common-main: delay trace2 initialization
[3/3]: config: stop checking whether the_repository is NULL
common-main.c | 8 ++++----
config.c | 2 +-
t/t1309-early-config.sh | 7 ++++++-
3 files changed, 11 insertions(+), 6 deletions(-)
-Peff
next prev parent reply other threads:[~2019-08-06 12:26 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
2019-08-06 12:26 ` Jeff King [this message]
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=20190806122601.GA21475@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@jeffhostetler.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.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).