diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-27 19:24:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-27 19:24:11 -0800 |
| commit | 98cdf78c5cf1356757ccc4d25c212ae1f38339e4 (patch) | |
| tree | 8c9936b21070e664e36f2b5e61b96e371f1a50f6 /parse-options.h | |
| parent | 496db64202b11e66a080873ca9e32f1354dcfd3e (diff) | |
| parent | c6576f912fc34193a02d7ec587484f7c2ce3fe77 (diff) | |
| download | git-98cdf78c5cf1356757ccc4d25c212ae1f38339e4.tar.xz | |
Merge branch 'ta/quiet-pull'
* ta/quiet-pull:
Retain multiple -q/-v occurrences in git pull
Teach/Fix pull/fetch -q/-v options
Diffstat (limited to 'parse-options.h')
| -rw-r--r-- | parse-options.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/parse-options.h b/parse-options.h index 5199950c00..034162ec69 100644 --- a/parse-options.h +++ b/parse-options.h @@ -150,9 +150,15 @@ extern int parse_options_end(struct parse_opt_ctx_t *ctx); /*----- some often used options -----*/ extern int parse_opt_abbrev_cb(const struct option *, const char *, int); extern int parse_opt_approxidate_cb(const struct option *, const char *, int); +extern int parse_opt_verbosity_cb(const struct option *, const char *, int); #define OPT__VERBOSE(var) OPT_BOOLEAN('v', "verbose", (var), "be verbose") #define OPT__QUIET(var) OPT_BOOLEAN('q', "quiet", (var), "be quiet") +#define OPT__VERBOSITY(var) \ + { OPTION_CALLBACK, 'v', "verbose", (var), NULL, "be more verbose", \ + PARSE_OPT_NOARG, &parse_opt_verbosity_cb, 0 }, \ + { OPTION_CALLBACK, 'q', "quiet", (var), NULL, "be more quiet", \ + PARSE_OPT_NOARG, &parse_opt_verbosity_cb, 0 } #define OPT__DRY_RUN(var) OPT_BOOLEAN('n', "dry-run", (var), "dry run") #define OPT__ABBREV(var) \ { OPTION_CALLBACK, 0, "abbrev", (var), "n", \ |