Re: What's cooking in git.git (Feb 2012, #05; Mon, 13)
- From
Jeff King <peff@peff.net>
- Date
- Feb 14, 2012, 22:09 UTC
- Message-ID
- <20120214220953.GC24802@sigill.intra.peff.net>
- In-Reply-To
- <7vmx8l5aw3.fsf@alter.siamese.dyndns.org>
On Tue, Feb 14, 2012 at 02:05:16PM -0800, Junio C Hamano wrote:
Show 7 quoted lines
> > Yikes. I was planning to re-roll this, but got sidetracked discussing > > David's git-cola case. Besides a few minor tweaks in the documentation > > patch, the actual include patch is buggy, and accidentally turns on > > includes for "git config --list". > > Hmm, I thought t1305 covered "config --list", and ... oops, it makes sure > the output contains the inclusion.
Yes. It should include it (and does correctly) when not using any per-file options, but does not correctly turn it off for the per-file case (because we bail to regular git_config instead of custom lookup code).
> > Do you want to revert and re-do to make master pretty, or should I just > > build on top? > > Do you mean 'next'?
I meant "revert from next and re-reroll, so that when the re-roll gets merged to master, the result there will look pretty".
-Peff