diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-02-25 23:47:35 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-02-25 23:47:35 (GMT) |
commit | d21d5ddfe675f9dbcdbb94ab01776115a2d1fdde (patch) | |
tree | 3b0761ff79a4e4a5c50263a8d324b6c6a9268e35 /builtin/log.c | |
parent | a47fcfe8712e3258d1c565cd654c9bd5312a5168 (diff) | |
parent | 9164d97a63b31614a52571d708f1ef151b97db71 (diff) | |
download | git-d21d5ddfe675f9dbcdbb94ab01776115a2d1fdde.zip git-d21d5ddfe675f9dbcdbb94ab01776115a2d1fdde.tar.gz git-d21d5ddfe675f9dbcdbb94ab01776115a2d1fdde.tar.bz2 |
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 'builtin/log.c')
-rw-r--r-- | builtin/log.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/log.c b/builtin/log.c index 093d0d2..905b234 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1993,8 +1993,9 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) if (rev.show_notes) load_display_notes(&rev.notes_opt); - if (use_stdout + rev.diffopt.close_file + !!output_directory > 1) - die(_("options '%s', '%s', and '%s' cannot be used together"), "--stdout", "--output", "--output-directory"); + die_for_incompatible_opt3(use_stdout, "--stdout", + rev.diffopt.close_file, "--output", + !!output_directory, "--output-directory"); if (use_stdout) { setup_pager(); |