зеркало из https://github.com/microsoft/git.git
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
This commit is contained in:
Коммит
8e663afb95
|
@ -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,
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче