diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-05-24 00:54:31 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-05-24 00:54:32 +0300 |
commit | 5d5f1c236b63596a59293a893d914dab1c8dd377 (patch) | |
tree | cdf9609dafcf846a91e3bf1cfb9c51d956bc7a5c /t/helper | |
parent | 72ce3ff7b51c1e0703f433fb000519521441abf8 (diff) | |
parent | aaab84203b9654fb73df41d3cb71a6aad3a091fa (diff) |
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
Diffstat (limited to 't/helper')
-rw-r--r-- | t/helper/test-parse-options.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/t/helper/test-parse-options.c b/t/helper/test-parse-options.c index 2c8c8f18ed..f02c275f33 100644 --- a/t/helper/test-parse-options.c +++ b/t/helper/test-parse-options.c @@ -7,7 +7,8 @@ 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; @@ -90,7 +91,7 @@ int main(int argc, char **argv) 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)"); |