From: Michael Haggerty <mhagger@alum.mit.edu>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/4] config: add include directive
Date: Fri, 27 Jan 2012 06:07:33 +0100 [thread overview]
Message-ID: <4F223115.3050004@alum.mit.edu> (raw)
In-Reply-To: <20120126073752.GA30474@sigill.intra.peff.net>
On 01/26/2012 08:37 AM, Jeff King wrote:
> [...]
> This patch introduces an include directive for config files.
> It looks like:
>
> [include]
> path = /path/to/file
I like it.
> diff --git a/cache.h b/cache.h
> index 10afd71..21bbb0a 100644
> --- a/cache.h
> +++ b/cache.h
> @@ -1138,6 +1138,12 @@ extern const char *get_commit_output_encoding(void);
>
> extern int git_config_parse_parameter(const char *, config_fn_t fn, void *data);
>
> +struct git_config_include_data {
> + config_fn_t fn;
> + void *data;
> +};
> +int git_config_include(const char *name, const char *value, void *vdata);
> +
> extern const char *config_exclusive_filename;
>
> #define MAX_GITNAME (1000)
How about a short comment or two?
> diff --git a/config.c b/config.c
> index 40f9c6d..a6966c1 100644
> --- a/config.c
> +++ b/config.c
> [...]
> +int git_config_include(const char *name, const char *value, void *vdata)
> +{
> + const struct git_config_include_data *data = vdata;
> + const char *type;
> + int ret;
> +
> + /*
> + * Pass along all values, including "include" directives; this makes it
> + * possible to query information on the includes themselves.
> + */
> + ret = data->fn(name, value, data->data);
> + if (ret < 0)
> + return ret;
> +
> + if (prefixcmp(name, "include."))
> + return ret;
> + type = strrchr(name, '.') + 1;
> +
> + if (!strcmp(type, "path"))
> + ret = handle_path_include(value, vdata);
> +
> + return ret;
> +}
> +
Doesn't this code accept all keys of the form "include\.(.*\.)?path"
(e.g., "include.foo.path")? If that is your intention, then the
documentation should be fixed. If not, then a single strcmp(name,
"include.path") would seem sufficient.
> int git_config_early(config_fn_t fn, void *data, const char *repo_config)
> {
> int ret = 0, found = 0;
> const char *home = NULL;
> + struct git_config_include_data inc;
> +
> + inc.fn = fn;
> + inc.data = data;
> + fn = git_config_include;
> + data = &inc;
>
> /* Setting $GIT_CONFIG makes git read _only_ the given config file. */
> if (config_exclusive_filename)
The comment just after your addition should be adjusted, since now "the
given config file and any files that it includes" are read.
Michael
--
Michael Haggerty
mhagger@alum.mit.edu
http://softwareswirl.blogspot.com/
next prev parent reply other threads:[~2012-01-27 5:07 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-26 7:35 [RFC/PATCH 0/4] config include directives Jeff King
2012-01-26 7:37 ` [PATCH 1/4] config: add include directive Jeff King
2012-01-26 9:16 ` Johannes Sixt
2012-01-26 16:54 ` Jeff King
2012-01-26 20:42 ` Junio C Hamano
2012-01-26 22:25 ` Jeff King
2012-01-26 22:43 ` Jeff King
2012-01-26 20:58 ` Junio C Hamano
2012-01-26 22:51 ` Jeff King
2012-01-27 5:23 ` Junio C Hamano
2012-01-27 5:55 ` Jeff King
2012-01-27 17:03 ` Jens Lehmann
2012-01-27 0:02 ` Ævar Arnfjörð Bjarmason
2012-01-27 0:32 ` Jeff King
2012-01-27 9:33 ` Ævar Arnfjörð Bjarmason
2012-01-27 5:07 ` Michael Haggerty [this message]
2012-01-27 5:54 ` Jeff King
2012-01-26 7:38 ` [PATCH 2/4] config: factor out config file stack management Jeff King
2012-01-26 7:40 ` [PATCH 3/4] config: support parsing config data from buffers Jeff King
2012-01-26 7:42 ` [PATCH 4/4] config: allow including config from repository blobs Jeff King
2012-01-26 9:25 ` Johannes Sixt
2012-01-26 17:22 ` Jeff King
2012-01-27 3:47 ` Nguyen Thai Ngoc Duy
2012-01-27 5:57 ` Jeff King
2012-01-26 21:14 ` Junio C Hamano
2012-01-26 23:00 ` Jeff King
2012-01-27 0:35 ` Junio C Hamano
2012-01-27 0:49 ` Jeff King
2012-01-27 5:30 ` Junio C Hamano
2012-01-27 5:42 ` Jeff King
2012-01-27 7:27 ` Johannes Sixt
2012-01-27 23:10 ` Junio C Hamano
2012-01-27 4:01 ` Nguyen Thai Ngoc Duy
2012-01-27 5:59 ` Jeff King
2012-01-27 9:51 ` [RFC/PATCH 0/4] config include directives Ævar Arnfjörð Bjarmason
2012-01-27 17:34 ` 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
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=4F223115.3050004@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).