From: Junio C Hamano <gitster@pobox•com>
To: Tanay Abhra <tanayabh@gmail•com>
Cc: Matthieu Moy <Matthieu.Moy@grenoble-inp•fr>,
git@vger•kernel.org, Ramkumar Ramachandra <artagnon@gmail•com>
Subject: Re: [PATCH v2 2/4] ll-merge.c: refactor `read_merge_config()` to use `git_config_string()`
Date: Wed, 13 Aug 2014 10:07:29 -0700 [thread overview]
Message-ID: <xmqqd2c448tq.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <53EB5D58.7000300@gmail.com> (Tanay Abhra's message of "Wed, 13 Aug 2014 18:13:04 +0530")
Tanay Abhra <tanayabh@gmail•com> writes:
> There is one slight behavior change, previously "merge.default"
> silently ignored a NULL value and didn't raise any error. But,
> in the same function, all other values raise an error on a NULL
> value. So to conform with other call sites in Git, a NULL value
> for "merge.default" raises an error.
Better explained than v1 ;-)
> Signed-off-by: Tanay Abhra <tanayabh@gmail•com>
> ---
> We cannot easily use the new config-set API here, because
> much of the function is dedicated to processing
> "merge.<name>.variable" which does not easily translate to
> the new API. If it were for variables like,
> "merge.summary", "merge.tool", and "merge.verbosity", we
> could use the new API.
I think this comment belongs to the log message, if only to serve as
a reminder for us that the API needs to be made more usable when the
caller wants to use these three-level names, which are quite common.
This code path knows the name of a low-level merge driver and wants
to learn everything about that driver. Another code path may know
the name of the branch and may want to scan "branch.<name>.*".
> ll-merge.c | 23 ++++++-----------------
> 1 file changed, 6 insertions(+), 17 deletions(-)
>
> diff --git a/ll-merge.c b/ll-merge.c
> index fb61ea6..8ea03e5 100644
> --- a/ll-merge.c
> +++ b/ll-merge.c
> @@ -225,11 +225,8 @@ static int read_merge_config(const char *var, const char *value, void *cb)
> const char *key, *name;
> int namelen;
>
> - if (!strcmp(var, "merge.default")) {
> - if (value)
> - default_ll_merge = xstrdup(value);
> - return 0;
> - }
> + if (!strcmp(var, "merge.default"))
> + return git_config_string(&default_ll_merge, var, value);
>
> /*
> * We are not interested in anything but "merge.<name>.variable";
> @@ -254,12 +251,8 @@ static int read_merge_config(const char *var, const char *value, void *cb)
> ll_user_merge_tail = &(fn->next);
> }
>
> - if (!strcmp("name", key)) {
> - if (!value)
> - return error("%s: lacks value", var);
> - fn->description = xstrdup(value);
> - return 0;
> - }
> + if (!strcmp("name", key))
> + return git_config_string(&fn->description, var, value);
>
> if (!strcmp("driver", key)) {
> if (!value)
> @@ -285,12 +278,8 @@ static int read_merge_config(const char *var, const char *value, void *cb)
> return 0;
> }
>
> - if (!strcmp("recursive", key)) {
> - if (!value)
> - return error("%s: lacks value", var);
> - fn->recursive = xstrdup(value);
> - return 0;
> - }
> + if (!strcmp("recursive", key))
> + return git_config_string(&fn->recursive, var, value);
>
> return 0;
> }
next prev parent reply other threads:[~2014-08-13 17:07 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-13 8:21 [PATCH 1/4] fast-import.c: replace `git_config()` with `git_config_get_*()` family Tanay Abhra
2014-08-13 8:22 ` [PATCH 2/4] ll-merge.c: refactor `read_merge_config()` to use `git_config_string()` Tanay Abhra
2014-08-13 11:32 ` Matthieu Moy
2014-08-13 12:43 ` [PATCH v2 " Tanay Abhra
2014-08-13 13:07 ` Matthieu Moy
2014-08-13 17:07 ` Junio C Hamano [this message]
2014-08-13 8:22 ` [PATCH 3/4] merge-recursive.c: replace `git_config()` with `git_config_get_int()` Tanay Abhra
2014-08-13 11:34 ` Matthieu Moy
2014-08-13 8:22 ` [PATCH 4/4] builtin/apply.c: replace `git_config()` with `git_config_get_string_const()` Tanay Abhra
2014-08-13 11:24 ` [PATCH 1/4] fast-import.c: replace `git_config()` with `git_config_get_*()` family Matthieu Moy
2014-08-13 12:11 ` Tanay Abhra
2014-08-13 12:22 ` [PATCH v2 1/5] " Tanay Abhra
2014-08-13 13:10 ` Matthieu Moy
2014-08-13 13:33 ` [PATCH/RFC v2 1/2] git_default_config() rewritten using the config-set API Tanay Abhra
2014-08-13 13:39 ` [PATCH/RFC v2 2/2] use the new git_default_config() Tanay Abhra
2014-08-13 16:00 ` [PATCH/RFC v2 1/2] git_default_config() rewritten using the config-set API Matthieu Moy
2014-08-13 17:18 ` Junio C Hamano
2014-08-13 16:16 ` Matthieu Moy
2014-08-13 17:14 ` [PATCH 1/4] fast-import.c: replace `git_config()` with `git_config_get_*()` family Junio C Hamano
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=xmqqd2c448tq.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=Matthieu.Moy@grenoble-inp$(echo .)fr \
--cc=artagnon@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=tanayabh@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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