From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 31 Jul 2019 21:37:01 GMT
Subject: Re: [PATCH 1/1] config: work around bug with includeif:onbranch and early config
Message-ID: <xmqq7e7xq41u.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <4aa88340132b03c9480c781cb5cb3c5b5513e944.1564602830.git.gitgitgadget@gmail.com>

"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:

> Let's work around this, simply by ignoring the `includeif.onbranch:`
> setting when parsing the config when the ref store has not been
> initialized (yet).

Interesting chicken-and-egg problem.

> Technically, there is a way to solve this properly: teach the refs
> machinery to initialize the ref_store from a given gitdir/commondir pair
> (which we _do_ have in the early config code path), and then use that in
> `include_by_branch()`. This, however, is a pretty involved project, and
> we're already in the feature freeze for Git v2.23.0.

Postponing the proper fix to the next cycle (or later) is good.