On Fri, May 6, 2016 at 12:44 AM, Junio C Hamano <[email protected]> wrote:
> Pranit Bauva <[email protected]> writes:
>
>> diff --git a/builtin/commit.c b/builtin/commit.c
>> index 391126e..114ffc9 100644
>> --- a/builtin/commit.c
>> +++ b/builtin/commit.c
>> @@ -113,7 +113,9 @@ static char *edit_message, *use_message;
>> static char *fixup_message, *squash_message;
>> static int all, also, interactive, patch_interactive, only, amend, signoff;
>> static int edit_flag = -1; /* unspecified */
>> -static int quiet, verbose, no_verify, allow_empty, dry_run,
>> renew_authorship;
>> +static int config_verbose = -1; /* unspecified */
>> +static int verbose = -1; /* unspecified */
>> +static int quiet, no_verify, allow_empty, dry_run, renew_authorship;
>
> The name does not make it clear that config_verbose is only for
> "commit" and not relevant to "status".
True.
>> @@ -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.
Yes
>> @@ -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.
Awesome work by addressing these points. I hadn't thought of these earlier.
> builtin/commit.c | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/builtin/commit.c b/builtin/commit.c
> index 583d1e3..a486620 100644
> --- a/builtin/commit.c
> +++ b/builtin/commit.c
> @@ -113,9 +113,8 @@ static char *edit_message, *use_message;
> static char *fixup_message, *squash_message;
> static int all, also, interactive, patch_interactive, only, amend, signoff;
> static int edit_flag = -1; /* unspecified */
> -static int config_verbose = -1; /* unspecified */
> -static int verbose = -1; /* unspecified */
> -static int quiet, no_verify, allow_empty, dry_run, renew_authorship;
> +static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship;
> +static int config_commit_verbose = -1; /* unspecified */
> static int no_post_rewrite, allow_empty_message;
> static char *untracked_files_arg, *force_date, *ignore_submodule_arg;
> static char *sign_commit;
> @@ -1366,8 +1365,6 @@ 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;
>
> handle_untracked_files_arg(&s);
> if (show_ignored_in_status)
> @@ -1521,7 +1518,7 @@ static int git_commit_config(const char *k, const char
> *v, void *cb)
> }
> if (!strcmp(k, "commit.verbose")) {
> int is_bool;
> - config_verbose = git_config_bool_or_int(k, v, &is_bool);
> + config_commit_verbose = git_config_bool_or_int(k, v,
> &is_bool);
> return 0;
> }
>
> @@ -1670,11 +1667,12 @@ int cmd_commit(int argc, const char **argv, const
> char *prefix)
> if (parse_commit(current_head))
> die(_("could not parse HEAD commit"));
> }
> + verbose = -1; /* unspecified */
> 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;
> + verbose = (config_commit_verbose < 0) ? 0 :
> config_commit_verbose;
>
> if (dry_run)
> return dry_run_commit(argc, argv, prefix, current_head, &s);
This makes things quite easy to understand.
Very simple speaking:
* Rename config_verbose => config_commit_verbose
* initialize verbose to -1 only in cmd_commit()
I checked out your branch gitster/pb/commit-verbose-config and tests
from t0040 seem to be failing. Don't worry I will handle those, I will
squash your patch in mine and re-roll it again. I am still unsure how
those tests broke. I will figure it out.
Thanks for your help! :)
--
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
