git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] submodule-config: correct error reporting for invalid ignore value
@ 2017-03-14 22:14 Stefan Beller
  2017-03-15 18:29 ` Junio C Hamano
  0 siblings, 1 reply; 5+ messages in thread
From: Stefan Beller @ 2017-03-14 22:14 UTC (permalink / raw)
  To: gitster; +Cc: git, Stefan Beller

As 'var' contains the whole value we get error messages that repeat
the section and key currently:

warning: Invalid parameter 'true' for config option 'submodule.submodule.plugins/hooks.ignore.ignore'

Fix this by only giving the section name in the warning.

Signed-off-by: Stefan Beller <sbeller@google.com>
---
 submodule-config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodule-config.c b/submodule-config.c
index 93453909cf..bb069bc097 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -333,7 +333,7 @@ static int parse_config(const char *var, const char *value, void *data)
 			 strcmp(value, "all") &&
 			 strcmp(value, "none"))
 			warning("Invalid parameter '%s' for config option "
-					"'submodule.%s.ignore'", value, var);
+					"'submodule.%s.ignore'", value, name.buf);
 		else {
 			free((void *) submodule->ignore);
 			submodule->ignore = xstrdup(value);
-- 
2.12.0.264.gd6db3f2165.dirty


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] submodule-config: correct error reporting for invalid ignore value
  2017-03-14 22:14 [PATCH] submodule-config: correct error reporting for invalid ignore value Stefan Beller
@ 2017-03-15 18:29 ` Junio C Hamano
  2017-03-15 18:39   ` Stefan Beller
  2017-03-15 19:52   ` Junio C Hamano
  0 siblings, 2 replies; 5+ messages in thread
From: Junio C Hamano @ 2017-03-15 18:29 UTC (permalink / raw)
  To: Stefan Beller; +Cc: git

Stefan Beller <sbeller@google.com> writes:

> As 'var' contains the whole value we get error messages that repeat
> the section and key currently:
>
> warning: Invalid parameter 'true' for config option 'submodule.submodule.plugins/hooks.ignore.ignore'
>
> Fix this by only giving the section name in the warning.
>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
>  submodule-config.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/submodule-config.c b/submodule-config.c
> index 93453909cf..bb069bc097 100644
> --- a/submodule-config.c
> +++ b/submodule-config.c
> @@ -333,7 +333,7 @@ static int parse_config(const char *var, const char *value, void *data)
>  			 strcmp(value, "all") &&
>  			 strcmp(value, "none"))
>  			warning("Invalid parameter '%s' for config option "
> -					"'submodule.%s.ignore'", value, var);
> +					"'submodule.%s.ignore'", value, name.buf);

Obviously correct.  Nobody seems to have complained about this since
it was first written in 2.6 days, which is a bit sad, though.

Thanks.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] submodule-config: correct error reporting for invalid ignore value
  2017-03-15 18:29 ` Junio C Hamano
@ 2017-03-15 18:39   ` Stefan Beller
  2017-03-15 19:52   ` Junio C Hamano
  1 sibling, 0 replies; 5+ messages in thread
From: Stefan Beller @ 2017-03-15 18:39 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git@vger.kernel.org

On Wed, Mar 15, 2017 at 11:29 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Stefan Beller <sbeller@google.com> writes:
>
>> As 'var' contains the whole value we get error messages that repeat
>> the section and key currently:
>>
>> warning: Invalid parameter 'true' for config option 'submodule.submodule.plugins/hooks.ignore.ignore'
>>
>> Fix this by only giving the section name in the warning.
>>
>> Signed-off-by: Stefan Beller <sbeller@google.com>
>> ---
>>  submodule-config.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/submodule-config.c b/submodule-config.c
>> index 93453909cf..bb069bc097 100644
>> --- a/submodule-config.c
>> +++ b/submodule-config.c
>> @@ -333,7 +333,7 @@ static int parse_config(const char *var, const char *value, void *data)
>>                        strcmp(value, "all") &&
>>                        strcmp(value, "none"))
>>                       warning("Invalid parameter '%s' for config option "
>> -                                     "'submodule.%s.ignore'", value, var);
>> +                                     "'submodule.%s.ignore'", value, name.buf);
>
> Obviously correct.  Nobody seems to have complained about this since
> it was first written in 2.6 days, which is a bit sad, though.
>
> Thanks.

https://trends.google.com/trends/explore?date=all&q=submodule,%2Fm%2F05vqwg
(Comparing "Submodule" (search term) with "Git" (System Software) over 10 years)

#TiL
* submodule searches are less than 1% of Git searches,
   so not a lot of users compared to Git itself.
* submodules are only used in larger countries unlike Git,
  which is used in a lot more countries (well, that may be
  displaying issues)
* submodules are a German thing (relatively speaking)
   followed by Russia, US, Canada, Australia, Japan.

:-)

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] submodule-config: correct error reporting for invalid ignore value
  2017-03-15 18:29 ` Junio C Hamano
  2017-03-15 18:39   ` Stefan Beller
@ 2017-03-15 19:52   ` Junio C Hamano
  2017-03-15 20:21     ` Stefan Beller
  1 sibling, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2017-03-15 19:52 UTC (permalink / raw)
  To: Stefan Beller; +Cc: git

Junio C Hamano <gitster@pobox.com> writes:

> Stefan Beller <sbeller@google.com> writes:
>
>> As 'var' contains the whole value we get error messages that repeat
>> the section and key currently:
>>
>> warning: Invalid parameter 'true' for config option 'submodule.submodule.plugins/hooks.ignore.ignore'
>>
>> Fix this by only giving the section name in the warning.
>>
>> Signed-off-by: Stefan Beller <sbeller@google.com>
>> ---
>>  submodule-config.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/submodule-config.c b/submodule-config.c
>> index 93453909cf..bb069bc097 100644
>> --- a/submodule-config.c
>> +++ b/submodule-config.c
>> @@ -333,7 +333,7 @@ static int parse_config(const char *var, const char *value, void *data)
>>  			 strcmp(value, "all") &&
>>  			 strcmp(value, "none"))
>>  			warning("Invalid parameter '%s' for config option "
>> -					"'submodule.%s.ignore'", value, var);
>> +					"'submodule.%s.ignore'", value, name.buf);
>
> Obviously correct.

But isn't this even more obviously correct?

	warning("invalid parameter '%s' for option %s", value, var);


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] submodule-config: correct error reporting for invalid ignore value
  2017-03-15 19:52   ` Junio C Hamano
@ 2017-03-15 20:21     ` Stefan Beller
  0 siblings, 0 replies; 5+ messages in thread
From: Stefan Beller @ 2017-03-15 20:21 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git@vger.kernel.org

On Wed, Mar 15, 2017 at 12:52 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> Stefan Beller <sbeller@google.com> writes:
>>
>>> As 'var' contains the whole value we get error messages that repeat
>>> the section and key currently:
>>>
>>> warning: Invalid parameter 'true' for config option 'submodule.submodule.plugins/hooks.ignore.ignore'
>>>
>>> Fix this by only giving the section name in the warning.
>>>
>>> Signed-off-by: Stefan Beller <sbeller@google.com>
>>> ---
>>>  submodule-config.c | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/submodule-config.c b/submodule-config.c
>>> index 93453909cf..bb069bc097 100644
>>> --- a/submodule-config.c
>>> +++ b/submodule-config.c
>>> @@ -333,7 +333,7 @@ static int parse_config(const char *var, const char *value, void *data)
>>>                       strcmp(value, "all") &&
>>>                       strcmp(value, "none"))
>>>                      warning("Invalid parameter '%s' for config option "
>>> -                                    "'submodule.%s.ignore'", value, var);
>>> +                                    "'submodule.%s.ignore'", value, name.buf);
>>
>> Obviously correct.
>
> But isn't this even more obviously correct?
>
>         warning("invalid parameter '%s' for option %s", value, var);
>

Yes. I considered this when writing the patch. It is also obviously correct.
The difference is whether you relay funny capitalization to the error message,
which I thought we might not want to do?

git grep warning yields e.g.
diff.c:                 warning(_("Unknown value for 'diff.submodule'
config variable: '%s'"),
diff.c:                 warning(_("Found errors in 'diff.dirstat'
config variable:\n%s"),

So I conclude that we want to present normalized capitalization for
config options
for error messages.

Thanks,
Stefan

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2017-03-15 20:29 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-14 22:14 [PATCH] submodule-config: correct error reporting for invalid ignore value Stefan Beller
2017-03-15 18:29 ` Junio C Hamano
2017-03-15 18:39   ` Stefan Beller
2017-03-15 19:52   ` Junio C Hamano
2017-03-15 20:21     ` Stefan Beller

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).