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 /builtin | |
| parent | 173d7746f6c3ee44855be3b6e9aec5457e6174e7 (diff) | |
| parent | 7854bf49604484a7276b96d312b9daf7d15c7b34 (diff) | |
| download | git-25e2039cf6619870bddc61d020bc5ccde85c6617.tar.gz | |
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 'builtin')
| -rw-r--r-- | builtin/clone.c | 4 | ||||
| -rw-r--r-- | builtin/merge-tree.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/builtin/clone.c b/builtin/clone.c index 54d9b9976a..d1801bbe1a 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -967,7 +967,9 @@ int cmd_clone(int argc, const char **argv, const char *prefix) } if (bundle_uri && deepen) - die(_("--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-exclude")); + die(_("options '%s' and '%s' cannot be used together"), + "--bundle-uri", + "--depth/--shallow-since/--shallow-exclude"); repo_name = argv[0]; diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index a35e0452d6..a4aa6013c5 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -577,7 +577,8 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix) if (o.mode == MODE_TRIVIAL) die(_("--trivial-merge is incompatible with all other options")); if (merge_base) - die(_("--merge-base is incompatible with --stdin")); + die(_("options '%s' and '%s' cannot be used together"), + "--merge-base", "--stdin"); line_termination = '\0'; while (strbuf_getline_lf(&buf, stdin) != EOF) { struct strbuf **split; |