From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Feb 2012, #05; Mon, 13)
Date: Tue, 14 Feb 2012 17:09:53 -0500 [thread overview]
Message-ID: <20120214220953.GC24802@sigill.intra.peff.net> (raw)
In-Reply-To: <7vmx8l5aw3.fsf@alter.siamese.dyndns.org>
On Tue, Feb 14, 2012 at 02:05:16PM -0800, Junio C Hamano wrote:
> > 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
next prev parent reply other threads:[~2012-02-14 22:10 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-13 20:42 What's cooking in git.git (Feb 2012, #05; Mon, 13) Junio C Hamano
2012-02-14 7:22 ` An incremental update to "What's cooking" Junio C Hamano
2012-02-14 21:47 ` What's cooking in git.git (Feb 2012, #05; Mon, 13) Jeff King
2012-02-14 22:05 ` Junio C Hamano
2012-02-14 22:09 ` Jeff King [this message]
2012-02-16 8:01 ` [PATCH 0/8] config-include fixes Jeff King
2012-02-16 8:02 ` [PATCH 1/8] t1300: add missing &&-chaining Jeff King
2012-02-16 8:03 ` [PATCH 2/8] config: copy the return value of prefix_filename Jeff King
2012-02-16 8:04 ` [PATCH 3/8] config: teach git_config_set_multivar_in_file a default path Jeff King
2012-02-16 8:04 ` [PATCH 4/8] config: teach git_config_rename_section a file argument Jeff King
2012-02-16 8:05 ` [PATCH 5/8] config: provide a version of git_config with more options Jeff King
2012-02-16 8:07 ` [PATCH 6/8] config: stop using config_exclusive_filename Jeff King
2012-02-16 8:09 ` [PATCH 7/8] config: eliminate config_exclusive_filename Jeff King
2012-02-16 8:10 ` [PATCH 8/8] config: do not respect includes for single-file --list Jeff King
2012-02-16 20:11 ` [PATCH 0/8] config-include fixes Junio C Hamano
2012-02-17 0:14 ` Jeff King
2012-02-17 2:50 ` Junio C Hamano
2012-02-17 3:17 ` Jeff King
2012-02-17 3:23 ` Jeff King
2012-02-17 8:17 ` [PATCH 0/2] api-config documentation leftovers Jeff King
2012-02-17 17:04 ` Junio C Hamano
2012-02-17 8:18 ` [PATCH 1/2] docs/api-config: minor clarifications Jeff King
2012-02-17 8:18 ` [PATCH 2/2] docs/api-config: describe git_config_with_options 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120214220953.GC24802@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--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.
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 NNTP newsgroup(s).