From: Jeff King <email@example.com> To: Johannes Schindelin <Johannes.Schindelin@gmx.de> Cc: Junio C Hamano <firstname.lastname@example.org>, email@example.com Subject: Re: js/early-config-with-onbranch, was Re: What's cooking in git.git (Aug 2019, #01; Thu, 1) Date: Fri, 2 Aug 2019 14:38:41 -0400 [thread overview] Message-ID: <20190802183840.GB26918@sigill.intra.peff.net> (raw) In-Reply-To: <nycvar.QRO.firstname.lastname@example.org> On Fri, Aug 02, 2019 at 02:12:34PM +0200, Johannes Schindelin wrote: > > > * js/early-config-with-onbranch (2019-07-31) 1 commit > > > (merged to 'next' on 2019-08-01 at 26b713c824) > > > + config: work around bug with includeif:onbranch and early config > > > > > > The recently added [includeif "onbranch:branch"] feature does not > > > work well with an early config mechanism, as it attempts to find > > > out what branch we are on before we even haven't located the git > > > repository. The inclusion during early config scan is ignored to > > > work around this issue. > > > > > > Will merge to 'master'. > > > > I had some open comments here on how the "do we have a repo" check is > > done, but I think what is committed here is functionally equivalent. I > > can pursue the NULL the_repository cleanups separately. > > Right, I read that as "maybe later" comments, as that project is so > different from trying to fix the `onbranch` feature with regards to the > early config machinery. > > Or did I misread and you want me to do anything about it before v2.23.0? I think when I wrote my original replies in the thread that I wasn't sure _what_ I wanted. :) I had originally hoped to convince you to switch to have_git_dir() now, but I do agree after investigating that it would require an extra patch to common-main. Mostly I was just trying to clarify here that my comments were not blockers for merging this; I couldn't find any case where your patch as-is would behave incorrectly. -Peff
next prev parent reply other threads:[~2019-08-02 18:38 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-01 20:05 Junio C Hamano 2019-08-01 21:42 ` Jeff King 2019-08-02 12:12 ` js/early-config-with-onbranch, was " Johannes Schindelin 2019-08-02 18:38 ` Jeff King [this message] 2019-08-02 16:23 ` Junio C Hamano 2019-08-02 12:06 ` js/visual-studio, was " Johannes Schindelin 2019-08-02 16:42 ` Junio C Hamano 2019-08-03 20:22 ` Johannes Schindelin 2019-08-05 18:40 ` Junio C Hamano
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=20190802183840.GB26918@sigill.intra.peff.net \ --email@example.com \ --cc=Johannes.Schindelin@gmx.de \ --firstname.lastname@example.org \ --email@example.com \ --subject='Re: js/early-config-with-onbranch, was Re: What'\''s cooking in git.git (Aug 2019, #01; Thu, 1)' \ /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
Code repositories for project(s) associated with this 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).