On Tue, Feb 14, 2012 at 05:09:53PM -0500, Jeff King wrote: > > 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". The fix for this is pretty straightforward. However, I took the opportunity to do some cleanup and fix some minor bugs while I was in the area, and ended up with quite a big series. I prepared this on top of what you have queued in jk/config-include. However, all of the cleanup is semantically independent of the topic (though there are a few minor textual conflicts). If I were re-rolling, I would put it all at the front, then squash patch 8 into my prior "implement config includes" patch. The patches are: [1/8]: t1300: add missing &&-chaining Obvious cleanup. [2/8]: config: copy the return value of prefix_filename Very minor bug. [3/8]: config: teach git_config_set_multivar_in_file a default path [4/8]: config: teach git_config_rename_section a file argument [5/8]: config: provide a version of git_config with more options [6/8]: config: stop using config_exclusive_filename [7/8]: config: eliminate config_exclusive_filename This is all cleanup which makes config_exclusive_filename go away. It's not strictly necessary for this series, but it's something I've been wanting to clean up for a while. And it does fix a few minor bugs (see patch 6/8). And the refactoring in 5/8 lays the groundwork for 8/8. [8/8]: config: do not respect includes for single-file --list The actual fix for the regression in my config-include patch. -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html