diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-03-15 16:05:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-15 16:05:59 -0700 |
| commit | 8e663afb95ba0da55246a1ae28292c687e8f4888 (patch) | |
| tree | 2aaa82dd499ce15841cdf8efdec7607ce1bcf149 | |
| parent | b09a8839a4a09ab5bea79bcfe892b2591097319a (diff) | |
| parent | 781fb7b4c2fd18040453e1676e505c5fd66ebd31 (diff) | |
| download | git-8e663afb95ba0da55246a1ae28292c687e8f4888.tar.gz | |
Merge branch 'as/option-names-in-messages'
Error message updates.
* as/option-names-in-messages:
revision.c: trivial fix to message
builtin/clone.c: trivial fix of message
builtin/remote.c: trivial fix of error message
transport-helper.c: trivial fix of error message
| -rw-r--r-- | builtin/clone.c | 2 | ||||
| -rw-r--r-- | builtin/remote.c | 2 | ||||
| -rw-r--r-- | revision.c | 2 | ||||
| -rw-r--r-- | transport-helper.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/builtin/clone.c b/builtin/clone.c index 93892ab568..f3bc6edef8 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -116,7 +116,7 @@ static struct option builtin_clone_options[] = { OPT_HIDDEN_BOOL(0, "naked", &option_bare, N_("create a bare repository")), OPT_BOOL(0, "mirror", &option_mirror, - N_("create a mirror repository (implies bare)")), + N_("create a mirror repository (implies --bare)")), OPT_BOOL('l', "local", &option_local, N_("to clone from a local repository")), OPT_BOOL(0, "no-hardlinks", &option_no_hardlinks, diff --git a/builtin/remote.c b/builtin/remote.c index d91bbe728d..8412d12fa5 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -150,7 +150,7 @@ static int parse_mirror_opt(const struct option *opt, const char *arg, int not) else if (!strcmp(arg, "push")) *mirror = MIRROR_PUSH; else - return error(_("unknown mirror argument: %s"), arg); + return error(_("unknown --mirror argument: %s"), arg); return 0; } diff --git a/revision.c b/revision.c index 45893651c2..d6436ee66b 100644 --- a/revision.c +++ b/revision.c @@ -2358,7 +2358,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg } else if (skip_prefix(arg, "--ancestry-path=", &optarg)) { struct commit *c; struct object_id oid; - const char *msg = _("could not get commit for ancestry-path argument %s"); + const char *msg = _("could not get commit for --ancestry-path argument %s"); revs->ancestry_path = 1; revs->simplify_history = 0; diff --git a/transport-helper.c b/transport-helper.c index dd6002b393..b660b7942f 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -1078,7 +1078,7 @@ static int push_refs_with_export(struct transport *transport, set_common_push_options(transport, data->name, flags); if (flags & TRANSPORT_PUSH_FORCE) { if (set_helper_option(transport, "force", "true") != 0) - warning(_("helper %s does not support 'force'"), data->name); + warning(_("helper %s does not support '--force'"), data->name); } helper = get_helper(transport); |