From: Eric Sunshine <sunshine@sunshineco.com>
To: larsxschneider@gmail.com
Cc: git@vger.kernel.org, sschuberth@gmail.com, peff@peff.net
Subject: Re: [PATCH v2] config: add '--sources' option to print the source of a config value
Date: Wed, 10 Feb 2016 14:03:28 -0500 [thread overview]
Message-ID: <20160210190328.GA2376@flurp.local> (raw)
In-Reply-To: <1455099198-11515-1-git-send-email-larsxschneider@gmail.com>
On Wed, Feb 10, 2016 at 11:13:18AM +0100, larsxschneider@gmail.com wrote:
> If config values are queried using 'git config' (e.g. via '--list' flag
> or the '--get*' flags) then it is sometimes hard to find the
> configuration file where the values were defined.
>
> Teach 'git config' the '--sources' option to print the source
> configuration file for every printed value.
>
> Based-on-patch-by: Jeff King <peff@peff.net>
> Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
> ---
> diff --git a/builtin/config.c b/builtin/config.c
> @@ -91,8 +94,58 @@ static void check_argc(int argc, int min, int max) {
> +/* output to either fp or buf; only one should be non-NULL */
> +static void show_config_source(struct strbuf *buf, FILE *fp)
> +{
> + char term = '\t';
> + char *prefix;
> + const char *fn = current_config_filename();
> +
> + if (end_null)
> + term = '\0';
> +
> + if (fn) {
> + if (given_config_source.use_stdin)
> + prefix = "stdin";
> + else if (given_config_source.blob)
> + prefix = "blob";
> + else
> + prefix = "file";
> + } else {
> + fn = "";
> + prefix = "cmd";
> + }
> +
> + if (fp)
> + fprintf(fp, "%s", prefix);
> + else {
> + strbuf_addstr(buf, prefix);
> + }
Style: drop unnecessary braces
> +
> + if (fp)
> + fputc(term, fp);
> + else
> + strbuf_addch(buf, term);
Why not combine this 'if' with the preceding one?
> +
> + if (!end_null)
> + quote_c_style(fn, buf, fp, 0);
> + else {
> + if (fp)
> + fprintf(fp, "%s", fn);
> + else
> + strbuf_addstr(buf, fn);
> + }
> +
> + if (fp)
> + fputc(term, fp);
> + else
> + strbuf_addch(buf, term);
> +}
Overall, due to its duality (outputting to FILE* or strbuf), this
function is more difficult to read than it probably ought to be. Have
you considered simplifying it by making it single-purpose. Something
like this, for instance:
static void get_config_source(const char **name, const char **prefix)
{
*name = current_config_filename();
if (!*name) {
*name = "";
*prefix = "cmd";
} else if (given_config_source.use_stdin)
*prefix = "stdin";
else if (given_config_source.blob)
*prefix = "blob";
else
*prefix = "file";
}
static void show_config_source(struct strbuf *buf)
{
char term = end_null ? '\0' : '\t';
char *prefix;
const char *name;
get_config_source(&name, &prefix);
strbuf_addstr(buf, prefix);
strbuf_addch(buf, term);
if (end_null)
strbuf_addstr(buf, name);
else
quote_c_style(name, buf, NULL, 0);
strbuf_addch(buf, term);
}
static int show_all_config(...)
{
if (show_sources) {
struct strbuf buf = STRBUF_INIT;
show_config_source(&buf);
fputs(buf.buf, stdout);
strbuf_release(&buf);
}
...
}
static int format_config(...)
{
if (show_sources)
show_config_source(buf);
...
}
prev parent reply other threads:[~2016-02-10 19:03 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-10 10:13 [PATCH v2] config: add '--sources' option to print the source of a config value larsxschneider
2016-02-10 12:47 ` Ramsay Jones
2016-02-10 15:28 ` Sebastian Schuberth
2016-02-10 16:03 ` Ramsay Jones
2016-02-10 12:54 ` Jeff King
2016-02-10 15:33 ` Sebastian Schuberth
2016-02-10 15:40 ` Jeff King
2016-02-10 15:57 ` Sebastian Schuberth
2016-02-10 16:24 ` Jeff King
2016-02-10 19:03 ` Eric Sunshine [this message]
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=20160210190328.GA2376@flurp.local \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=larsxschneider@gmail.com \
--cc=peff@peff.net \
--cc=sschuberth@gmail.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.
Code repositories for project(s) associated with this public 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).