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

diff --git a/builtin/clone.c b/builtin/clone.c
index 93892ab5682ce51e1a131d845386e555a99b893c..f3bc6edef8ce4bf15998bbf87fd2d5af4d7e3353 100644 (file)
--- 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 d91bbe728d739e074e5f4fa54f70c186f371c1b7..8412d12fa55100132c69ae24914b2db536bf77c9 100644 (file)
--- 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 45893651c22f2669da8d5fe38a0b809e650d6f6d..d6436ee66b146f63e4aabf16377491d470583328 100644 (file)
--- 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 dd6002b393738df81c7ecfc85deb4ed0abe4943c..b660b7942f9f9dbfc76193968d3511047b8afd84 100644 (file)
--- 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);