Merge branch 'js/params-vs-args'

Messages update.

* js/params-vs-args:
  replace "parameters" by "arguments" in error messages

diff --git a/bisect.c b/bisect.c
index 75ea0eb57ff18979702b0abd5da345f27948e530..ae48d19acf6c70b97790edca0aca36d63d87f0da 100644 (file)
--- a/bisect.c
+++ b/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;
        }

diff --git a/builtin/notes.c b/builtin/notes.c
index 2987c08a2e920d294f5a443d24381b6021c15fea..08b8914d299517013395063704d36556fd9435df 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -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);
        }
 

diff --git a/builtin/stash.c b/builtin/stash.c
index 6f2b58f6ab2046aebd13a1a6486f1bd59662f7f9..ba774cce674f339bf68d5fcda80eb8b2d8253cf2 100644 (file)
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -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();

diff --git a/builtin/tag.c b/builtin/tag.c
index 4237dc724c75f3ae30df6716ae37dd37b844bbda..d403417b562595832513cd6e88e4d58c4076336e 100644 (file)
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -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);

diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
index 4af881f0baa8628c7928606686fff356fffe03fd..d742be8840276a52ef5887659d5405e1f9b08404 100755 (executable)
--- a/t/t3301-notes.sh
+++ b/t/t3301-notes.sh
@@ -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' '

diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index ef7bdcedf2304ef3e6d1379f29742dcfcf5ee28b..0ba5a91b4e205c75c47a254a8acb9bdfdbf7af5d 100755 (executable)
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -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' '