diff options
| author | Jean-Noël Avila <jn.avila@free.fr> | 2022-01-31 22:07:46 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-04 13:58:28 -0800 |
| commit | a699367bb8749a338aefb092c5d7ac75c69d61e1 (patch) | |
| tree | c09bbd28e122a8a2b718fed0c41fbecd743ad8cf /builtin/log.c | |
| parent | Sync with Git 2.35.1 (diff) | |
| download | git-a699367bb8749a338aefb092c5d7ac75c69d61e1.tar.gz git-a699367bb8749a338aefb092c5d7ac75c69d61e1.zip | |
i18n: factorize more 'incompatible options' messages
Find more incompatible options to factorize.
When more than two options are mutually exclusive, print the ones
which are actually on the command line.
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 4b493408cc..970aa3483c 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1978,8 +1978,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(); |