On Thu, May 5, 2016 at 3:14 PM, Junio C Hamano <[email protected]> wrote:
> Pranit Bauva <[email protected]> writes:
>> +static int config_verbose = -1; /* unspecified */
>
> The name does not make it clear that config_verbose is only for
> "commit" and not relevant to "status".
>
>> @@ -1364,6 +1366,8 @@ int cmd_status(int argc, const char **argv, const char
>> *prefix)
>> builtin_status_usage, 0);
>> finalize_colopts(&s.colopts, -1);
>> finalize_deferred_config(&s);
>> + if (verbose == -1)
>> + verbose = 0;
>
> Mental note: cmd_status() does not use git_commit_config() but uses
> git_status_config(), hence config_verbose is not affected. But
> because verbose is initialised to -1, the code needs to turn it off
> like this.
>
>> @@ -1664,6 +1673,9 @@ int cmd_commit(int argc, const char **argv, const char
>> *prefix)
>> argc = parse_and_validate_options(argc, argv, builtin_commit_options,
>> builtin_commit_usage,
>> prefix, current_head, &s);
>> + if (verbose == -1)
>> + verbose = (config_verbose < 0) ? 0 : config_verbose;
>> +
>
> cmd_commit() does use git_commit_config(), and verbose is
> initialised -1, so without command line option, we fall back to
> config_verbose if it is set from the configuration.
>
> I wonder if the attached patch squashed into this commit makes
> things easier to understand, though. The points are:
>
> - We rename the configuration to make it clear that it is about
> "commit" and does not apply to "status".
>
> - We initialize verbose to 0 as before. The only thing "git
> status" cares about is if "--verbose" was given. Giving it
> "--no-verbose" or nothing should not make any difference.
>
> - But we do need to stuff -1 to verbose in "git commit" before
> handling the command line options, because the distinction
> between having "--no-verbose" and not having any matter there,
> and we do so in cmd_commit(), i.e. only place where it matters.
Hmm... if someday someone wants git-status to support a status.verbose
config variable, with Pranit's current implementation, it's a pretty
simple change: Just add to git_status_config():
if (!strcmp(k, "status.verbose")) {
int is_bool;
config_verbose = git_config_bool_or_int(k, v, &is_bool);
return 0;
}
and in cmd_status() change:
if (verbose == -1)
verbose = 0;
to:
if (verbose == -1)
verbose = (config_verbose < 0) ? 0 : config_verbose;
It wouldn't be too hard with your proposal either: Either add a
'config_status_verbose' variable or rename 'config_commit_verbose'
back to 'config_verbose', initialize the global 'verbose' to -1, drop
the explicit 'verbose = -1' from cmd_commit(), and make the same
changes shown for Pranit's version. The diff would be a bit noisier.
I do like that your proposal makes it more difficult for
commit.verbose to break git-status, but otherwise don't feel that it
is significantly better. So, I dunno...
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
