diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-26 00:47:35 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-26 00:47:35 +0100 |
| commit | d21d5ddfe675f9dbcdbb94ab01776115a2d1fdde (patch) | |
| tree | 3b0761ff79a4e4a5c50263a8d324b6c6a9268e35 /parse-options.h | |
| parent | Merge branch 'ab/only-single-progress-at-once' (diff) | |
| parent | i18n: fix some misformated placeholders in command synopsis (diff) | |
| download | git-d21d5ddfe675f9dbcdbb94ab01776115a2d1fdde.tar.xz git-d21d5ddfe675f9dbcdbb94ab01776115a2d1fdde.zip | |
Merge branch 'ja/i18n-common-messages'
Unify more messages to help l10n.
* ja/i18n-common-messages:
i18n: fix some misformated placeholders in command synopsis
i18n: remove from i18n strings that do not hold translatable parts
i18n: factorize "invalid value" messages
i18n: factorize more 'incompatible options' messages
Diffstat (limited to 'parse-options.h')
| -rw-r--r-- | parse-options.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/parse-options.h b/parse-options.h index 659a4c28b2..685fccac13 100644 --- a/parse-options.h +++ b/parse-options.h @@ -240,6 +240,22 @@ void NORETURN usage_msg_optf(const char *fmt, const char * const *usagestr, const struct option *options, ...); +void die_for_incompatible_opt4(int opt1, const char *opt1_name, + int opt2, const char *opt2_name, + int opt3, const char *opt3_name, + int opt4, const char *opt4_name); + + +static inline void die_for_incompatible_opt3(int opt1, const char *opt1_name, + int opt2, const char *opt2_name, + int opt3, const char *opt3_name) +{ + die_for_incompatible_opt4(opt1, opt1_name, + opt2, opt2_name, + opt3, opt3_name, + 0, ""); +} + /* * Use these assertions for callbacks that expect to be called with NONEG and * NOARG respectively, and do not otherwise handle the "unset" and "arg" |