Merge branch 'js/params-vs-args'
Messages update. * js/params-vs-args: replace "parameters" by "arguments" in error messages
This commit is contained in:
commit
1c8f5dfa42
2
bisect.c
2
bisect.c
@ -1064,7 +1064,7 @@ enum bisect_error bisect_next_all(struct repository *r, const char *prefix)
|
||||
|
||||
if (!all) {
|
||||
fprintf(stderr, _("No testable commit found.\n"
|
||||
"Maybe you started with bad path parameters?\n"));
|
||||
"Maybe you started with bad path arguments?\n"));
|
||||
|
||||
return BISECT_NO_TESTABLE_COMMIT;
|
||||
}
|
||||
|
@ -373,7 +373,7 @@ static int list(int argc, const char **argv, const char *prefix)
|
||||
git_notes_list_usage, 0);
|
||||
|
||||
if (1 < argc) {
|
||||
error(_("too many parameters"));
|
||||
error(_("too many arguments"));
|
||||
usage_with_options(git_notes_list_usage, options);
|
||||
}
|
||||
|
||||
@ -428,7 +428,7 @@ static int add(int argc, const char **argv, const char *prefix)
|
||||
PARSE_OPT_KEEP_ARGV0);
|
||||
|
||||
if (2 < argc) {
|
||||
error(_("too many parameters"));
|
||||
error(_("too many arguments"));
|
||||
usage_with_options(git_notes_add_usage, options);
|
||||
}
|
||||
|
||||
@ -506,7 +506,7 @@ static int copy(int argc, const char **argv, const char *prefix)
|
||||
|
||||
if (from_stdin || rewrite_cmd) {
|
||||
if (argc) {
|
||||
error(_("too many parameters"));
|
||||
error(_("too many arguments"));
|
||||
usage_with_options(git_notes_copy_usage, options);
|
||||
} else {
|
||||
return notes_copy_from_stdin(force, rewrite_cmd);
|
||||
@ -514,11 +514,11 @@ static int copy(int argc, const char **argv, const char *prefix)
|
||||
}
|
||||
|
||||
if (argc < 1) {
|
||||
error(_("too few parameters"));
|
||||
error(_("too few arguments"));
|
||||
usage_with_options(git_notes_copy_usage, options);
|
||||
}
|
||||
if (2 < argc) {
|
||||
error(_("too many parameters"));
|
||||
error(_("too many arguments"));
|
||||
usage_with_options(git_notes_copy_usage, options);
|
||||
}
|
||||
|
||||
@ -595,7 +595,7 @@ static int append_edit(int argc, const char **argv, const char *prefix)
|
||||
PARSE_OPT_KEEP_ARGV0);
|
||||
|
||||
if (2 < argc) {
|
||||
error(_("too many parameters"));
|
||||
error(_("too many arguments"));
|
||||
usage_with_options(usage, options);
|
||||
}
|
||||
|
||||
@ -662,7 +662,7 @@ static int show(int argc, const char **argv, const char *prefix)
|
||||
0);
|
||||
|
||||
if (1 < argc) {
|
||||
error(_("too many parameters"));
|
||||
error(_("too many arguments"));
|
||||
usage_with_options(git_notes_show_usage, options);
|
||||
}
|
||||
|
||||
@ -812,7 +812,7 @@ static int merge(int argc, const char **argv, const char *prefix)
|
||||
error(_("must specify a notes ref to merge"));
|
||||
usage_with_options(git_notes_merge_usage, options);
|
||||
} else if (!do_merge && argc) {
|
||||
error(_("too many parameters"));
|
||||
error(_("too many arguments"));
|
||||
usage_with_options(git_notes_merge_usage, options);
|
||||
}
|
||||
|
||||
@ -960,7 +960,7 @@ static int prune(int argc, const char **argv, const char *prefix)
|
||||
0);
|
||||
|
||||
if (argc) {
|
||||
error(_("too many parameters"));
|
||||
error(_("too many arguments"));
|
||||
usage_with_options(git_notes_prune_usage, options);
|
||||
}
|
||||
|
||||
@ -982,7 +982,7 @@ static int get_ref(int argc, const char **argv, const char *prefix)
|
||||
git_notes_get_ref_usage, 0);
|
||||
|
||||
if (argc) {
|
||||
error(_("too many parameters"));
|
||||
error(_("too many arguments"));
|
||||
usage_with_options(git_notes_get_ref_usage, options);
|
||||
}
|
||||
|
||||
|
@ -222,7 +222,7 @@ static int clear_stash(int argc, const char **argv, const char *prefix)
|
||||
PARSE_OPT_STOP_AT_NON_OPTION);
|
||||
|
||||
if (argc)
|
||||
return error(_("git stash clear with parameters is "
|
||||
return error(_("git stash clear with arguments is "
|
||||
"unimplemented"));
|
||||
|
||||
return do_clear_stash();
|
||||
|
@ -572,7 +572,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
|
||||
|
||||
object_ref = argc == 2 ? argv[1] : "HEAD";
|
||||
if (argc > 2)
|
||||
die(_("too many params"));
|
||||
die(_("too many arguments"));
|
||||
|
||||
if (get_oid(object_ref, &object))
|
||||
die(_("Failed to resolve '%s' as a valid ref."), object_ref);
|
||||
|
@ -1293,11 +1293,11 @@ test_expect_success 'GIT_NOTES_REWRITE_REF overrides config' '
|
||||
grep "replacement note 3" actual
|
||||
'
|
||||
|
||||
test_expect_success 'git notes copy diagnoses too many or too few parameters' '
|
||||
test_expect_success 'git notes copy diagnoses too many or too few arguments' '
|
||||
test_must_fail git notes copy 2>error &&
|
||||
test_i18ngrep "too few parameters" error &&
|
||||
test_i18ngrep "too few arguments" error &&
|
||||
test_must_fail git notes copy one two three 2>error &&
|
||||
test_i18ngrep "too many parameters" error
|
||||
test_i18ngrep "too many arguments" error
|
||||
'
|
||||
|
||||
test_expect_success 'git notes get-ref expands refs/heads/main to refs/notes/refs/heads/main' '
|
||||
|
@ -578,9 +578,9 @@ test_expect_success 'skipping away from skipped commit' '
|
||||
test "$para3" = "$PARA_HASH3"
|
||||
'
|
||||
|
||||
test_expect_success 'erroring out when using bad path parameters' '
|
||||
test_expect_success 'erroring out when using bad path arguments' '
|
||||
test_must_fail git bisect start $PARA_HASH7 $HASH1 -- foobar 2> error.txt &&
|
||||
test_i18ngrep "bad path parameters" error.txt
|
||||
test_i18ngrep "bad path arguments" error.txt
|
||||
'
|
||||
|
||||
test_expect_success 'test bisection on bare repo - --no-checkout specified' '
|
||||
|
Loading…
Reference in New Issue
Block a user