From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 May 2016 21:54:31 +0000 (-0700)
Subject: Merge branch 'pb/commit-verbose-config'
X-Git-Tag: v2.9.0-rc0~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5d5f1c236b63596a59293a893d914dab1c8dd377?ds=inline;hp=--cc

Merge branch 'pb/commit-verbose-config'

"git commit" learned to pay attention to "commit.verbose"
configuration variable and act as if "--verbose" option was
given from the command line.

* pb/commit-verbose-config:
commit: add a commit.verbose config variable
t7507-commit-verbose: improve test coverage by testing number of diffs
parse-options.c: make OPTION_COUNTUP respect "unspecified" values
t/t7507: improve test coverage
t0040-parse-options: improve test coverage
test-parse-options: print quiet as integer
t0040-test-parse-options.sh: fix style issues
---

5d5f1c236b63596a59293a893d914dab1c8dd377
diff --cc Documentation/config.txt
index ea928a729f,8bf60409f7..53f00dbc26
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -1138,9 -1106,14 +1138,13 @@@ commit.status:
  	message.  Defaults to true.
  
  commit.template::
 -	Specify a file to use as the template for new commit messages.
 -	"`~/`" is expanded to the value of `$HOME` and "`~user/`" to the
 -	specified user's home directory.
 +	Specify the pathname of a file to use as the template for
 +	new commit messages.
  
+ commit.verbose::
+ 	A boolean or int to specify the level of verbose with `git commit`.
+ 	See linkgit:git-commit[1].
+ 
  credential.helper::
  	Specify an external helper to be called when a username or
  	password credential is needed; the helper may consult external
diff --cc t/helper/test-parse-options.c
index 2c8c8f18ed,0000000000..f02c275f33
mode 100644,000000..100644
--- a/t/helper/test-parse-options.c
+++ b/t/helper/test-parse-options.c
@@@ -1,104 -1,0 +1,105 @@@
 +#include "cache.h"
 +#include "parse-options.h"
 +#include "string-list.h"
 +
 +static int boolean = 0;
 +static int integer = 0;
 +static unsigned long magnitude = 0;
 +static unsigned long timestamp;
 +static int abbrev = 7;
- static int verbose = 0, dry_run = 0, quiet = 0;
++static int verbose = -1; /* unspecified */
++static int dry_run = 0, quiet = 0;
 +static char *string = NULL;
 +static char *file = NULL;
 +static int ambiguous;
 +static struct string_list list;
 +
 +static int length_callback(const struct option *opt, const char *arg, int unset)
 +{
 +	printf("Callback: \"%s\", %d\n",
 +		(arg ? arg : "not set"), unset);
 +	if (unset)
 +		return 1; /* do not support unset */
 +
 +	*(int *)opt->value = strlen(arg);
 +	return 0;
 +}
 +
 +static int number_callback(const struct option *opt, const char *arg, int unset)
 +{
 +	*(int *)opt->value = strtol(arg, NULL, 10);
 +	return 0;
 +}
 +
 +int main(int argc, char **argv)
 +{
 +	const char *prefix = "prefix/";
 +	const char *usage[] = {
 +		"test-parse-options <options>",
 +		NULL
 +	};
 +	struct option options[] = {
 +		OPT_BOOL(0, "yes", &boolean, "get a boolean"),
 +		OPT_BOOL('D', "no-doubt", &boolean, "begins with 'no-'"),
 +		{ OPTION_SET_INT, 'B', "no-fear", &boolean, NULL,
 +		  "be brave", PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
 +		OPT_COUNTUP('b', "boolean", &boolean, "increment by one"),
 +		OPT_BIT('4', "or4", &boolean,
 +			"bitwise-or boolean with ...0100", 4),
 +		OPT_NEGBIT(0, "neg-or4", &boolean, "same as --no-or4", 4),
 +		OPT_GROUP(""),
 +		OPT_INTEGER('i', "integer", &integer, "get a integer"),
 +		OPT_INTEGER('j', NULL, &integer, "get a integer, too"),
 +		OPT_MAGNITUDE('m', "magnitude", &magnitude, "get a magnitude"),
 +		OPT_SET_INT(0, "set23", &integer, "set integer to 23", 23),
 +		OPT_DATE('t', NULL, &timestamp, "get timestamp of <time>"),
 +		OPT_CALLBACK('L', "length", &integer, "str",
 +			"get length of <str>", length_callback),
 +		OPT_FILENAME('F', "file", &file, "set file to <file>"),
 +		OPT_GROUP("String options"),
 +		OPT_STRING('s', "string", &string, "string", "get a string"),
 +		OPT_STRING(0, "string2", &string, "str", "get another string"),
 +		OPT_STRING(0, "st", &string, "st", "get another string (pervert ordering)"),
 +		OPT_STRING('o', NULL, &string, "str", "get another string"),
 +		OPT_NOOP_NOARG(0, "obsolete"),
 +		OPT_STRING_LIST(0, "list", &list, "str", "add str to list"),
 +		OPT_GROUP("Magic arguments"),
 +		OPT_ARGUMENT("quux", "means --quux"),
 +		OPT_NUMBER_CALLBACK(&integer, "set integer to NUM",
 +			number_callback),
 +		{ OPTION_COUNTUP, '+', NULL, &boolean, NULL, "same as -b",
 +		  PARSE_OPT_NOARG | PARSE_OPT_NONEG | PARSE_OPT_NODASH },
 +		{ OPTION_COUNTUP, 0, "ambiguous", &ambiguous, NULL,
 +		  "positive ambiguity", PARSE_OPT_NOARG | PARSE_OPT_NONEG },
 +		{ OPTION_COUNTUP, 0, "no-ambiguous", &ambiguous, NULL,
 +		  "negative ambiguity", PARSE_OPT_NOARG | PARSE_OPT_NONEG },
 +		OPT_GROUP("Standard options"),
 +		OPT__ABBREV(&abbrev),
 +		OPT__VERBOSE(&verbose, "be verbose"),
 +		OPT__DRY_RUN(&dry_run, "dry run"),
 +		OPT__QUIET(&quiet, "be quiet"),
 +		OPT_END(),
 +	};
 +	int i;
 +
 +	argc = parse_options(argc, (const char **)argv, prefix, options, usage, 0);
 +
 +	printf("boolean: %d\n", boolean);
 +	printf("integer: %d\n", integer);
 +	printf("magnitude: %lu\n", magnitude);
 +	printf("timestamp: %lu\n", timestamp);
 +	printf("string: %s\n", string ? string : "(not set)");
 +	printf("abbrev: %d\n", abbrev);
 +	printf("verbose: %d\n", verbose);
- 	printf("quiet: %s\n", quiet ? "yes" : "no");
++	printf("quiet: %d\n", quiet);
 +	printf("dry run: %s\n", dry_run ? "yes" : "no");
 +	printf("file: %s\n", file ? file : "(not set)");
 +
 +	for (i = 0; i < list.nr; i++)
 +		printf("list: %s\n", list.items[i].string);
 +
 +	for (i = 0; i < argc; i++)
 +		printf("arg %02d: %s\n", i, argv[i]);
 +
 +	return 0;
 +}