diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-02-08 16:22:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-08 16:22:05 -0800 |
| commit | 25e2039cf6619870bddc61d020bc5ccde85c6617 (patch) | |
| tree | ad0a02f1a0325d26023b92159e314a6ba9cf038d /parse-options.c | |
| parent | Merge branch 'jb/reflog-expire-delete-dry-run-options' into maint-2.43 (diff) | |
| parent | i18n: factorize even more 'incompatible options' messages (diff) | |
| download | git-25e2039cf6619870bddc61d020bc5ccde85c6617.tar.gz git-25e2039cf6619870bddc61d020bc5ccde85c6617.zip | |
Merge branch 'rs/i18n-cannot-be-used-together' into maint-2.43
Clean-up code that handles combinations of incompatible options.
* rs/i18n-cannot-be-used-together:
i18n: factorize even more 'incompatible options' messages
Diffstat (limited to 'parse-options.c')
| -rw-r--r-- | parse-options.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/parse-options.c b/parse-options.c index d50962062e..65fab5bb9d 100644 --- a/parse-options.c +++ b/parse-options.c @@ -279,7 +279,8 @@ static enum parse_opt_result get_value(struct parse_opt_ctx_t *p, opt_name = optnamearg(opt, arg, flags); other_opt_name = optnamearg(elem->opt, elem->arg, elem->flags); - error(_("%s is incompatible with %s"), opt_name, other_opt_name); + error(_("options '%s' and '%s' cannot be used together"), + opt_name, other_opt_name); free(opt_name); free(other_opt_name); return -1; |