diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-02-05 20:42:31 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-02-05 20:42:31 +0300 |
commit | 008028a910b1bb820ad14b976665acf0f5cd4015 (patch) | |
tree | 1c71dffb14a12743c5e9d01d98b9780e1894e455 /parse-options.h | |
parent | 66775d210960f82ff0d4f69480df51bf44ea718b (diff) | |
parent | 5fb249021cfd1cf937a608610c330152936887e1 (diff) |
Merge branch 'ab/cat-file'
Assorted updates to "git cat-file", especially "-h".
* ab/cat-file:
cat-file: s/_/-/ in typo'd usage_msg_optf() message
cat-file: don't whitespace-pad "(...)" in SYNOPSIS and usage output
cat-file: use GET_OID_ONLY_TO_DIE in --(textconv|filters)
object-name.c: don't have GET_OID_ONLY_TO_DIE imply *_QUIETLY
cat-file: correct and improve usage information
cat-file: fix remaining usage bugs
cat-file: make --batch-all-objects a CMDMODE
cat-file: move "usage" variable to cmd_cat_file()
cat-file docs: fix SYNOPSIS and "-h" output
parse-options API: add a usage_msg_optf()
cat-file tests: test messaging on bad objects/paths
cat-file tests: test bad usage
Diffstat (limited to 'parse-options.h')
-rw-r--r-- | parse-options.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/parse-options.h b/parse-options.h index e22846d3b7..cbeb97b90e 100644 --- a/parse-options.h +++ b/parse-options.h @@ -225,6 +225,16 @@ NORETURN void usage_msg_opt(const char *msg, const char * const *usagestr, const struct option *options); +/** + * usage_msg_optf() is like usage_msg_opt() except that the first + * argument is a format string, and optional format arguments follow + * after the 3rd option. + */ +__attribute__((format (printf,1,4))) +void NORETURN usage_msg_optf(const char *fmt, + const char * const *usagestr, + const struct option *options, ...); + /* * Use these assertions for callbacks that expect to be called with NONEG and * NOARG respectively, and do not otherwise handle the "unset" and "arg" |