replace "parameters" by "arguments" in error messages
When an error message informs the user about an incorrect command invocation, it should refer to "arguments", not "parameters". Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Sixt committed
Feb 23, 2021 at 22:11 UTC
b865734760c2f677d625a1d939071844048051e4
6 files changed
+18
-18
bisect.c
+1
-1
@@ -1064,7 +1064,7 @@ enum bisect_error bisect_next_all(struct repository *r, const char *prefix)
1064
1065
if (!all) {
1066
fprintf(stderr, _("No testable commit found.\n"
1067
- "Maybe you started with bad path parameters?\n"));
1067
+ "Maybe you started with bad path arguments?\n"));
1068
1069
return BISECT_NO_TESTABLE_COMMIT;
1070
}
builtin/notes.c
+10
-10
@@ -373,7 +373,7 @@ static int list(int argc, const char **argv, const char *prefix)
373
git_notes_list_usage, 0);
374
375
if (1 < argc) {
376
- error(_("too many parameters"));
376
+ error(_("too many arguments"));
377
usage_with_options(git_notes_list_usage, options);
378
}
379
@@ -428,7 +428,7 @@ static int add(int argc, const char **argv, const char *prefix)
428
PARSE_OPT_KEEP_ARGV0);
429
430
if (2 < argc) {
431
- error(_("too many parameters"));
431
+ error(_("too many arguments"));
432
usage_with_options(git_notes_add_usage, options);
433
}
434
@@ -506,7 +506,7 @@ static int copy(int argc, const char **argv, const char *prefix)
506
507
if (from_stdin || rewrite_cmd) {
508
if (argc) {
509
- error(_("too many parameters"));
509
+ error(_("too many arguments"));
510
usage_with_options(git_notes_copy_usage, options);
511
} else {
512
return notes_copy_from_stdin(force, rewrite_cmd);
@@ -514,11 +514,11 @@ static int copy(int argc, const char **argv, const char *prefix)
514
}
515
516
if (argc < 1) {
517
- error(_("too few parameters"));
517
+ error(_("too few arguments"));
518
usage_with_options(git_notes_copy_usage, options);
519
}
520
if (2 < argc) {
521
- error(_("too many parameters"));
521
+ error(_("too many arguments"));
522
usage_with_options(git_notes_copy_usage, options);
523
}
524
@@ -595,7 +595,7 @@ static int append_edit(int argc, const char **argv, const char *prefix)
595
PARSE_OPT_KEEP_ARGV0);
596
597
if (2 < argc) {
598
- error(_("too many parameters"));
598
+ error(_("too many arguments"));
599
usage_with_options(usage, options);
600
}
601
@@ -662,7 +662,7 @@ static int show(int argc, const char **argv, const char *prefix)
662
0);
663
664
if (1 < argc) {
665
- error(_("too many parameters"));
665
+ error(_("too many arguments"));
666
usage_with_options(git_notes_show_usage, options);
667
}
668
@@ -812,7 +812,7 @@ static int merge(int argc, const char **argv, const char *prefix)
812
error(_("must specify a notes ref to merge"));
813
usage_with_options(git_notes_merge_usage, options);
814
} else if (!do_merge && argc) {
815
- error(_("too many parameters"));
815
+ error(_("too many arguments"));
816
usage_with_options(git_notes_merge_usage, options);
817
}
818
@@ -960,7 +960,7 @@ static int prune(int argc, const char **argv, const char *prefix)
960
0);
961
962
if (argc) {
963
- error(_("too many parameters"));
963
+ error(_("too many arguments"));
964
usage_with_options(git_notes_prune_usage, options);
965
}
966
@@ -982,7 +982,7 @@ static int get_ref(int argc, const char **argv, const char *prefix)
982
git_notes_get_ref_usage, 0);
983
984
if (argc) {
985
- error(_("too many parameters"));
985
+ error(_("too many arguments"));
986
usage_with_options(git_notes_get_ref_usage, options);
987
}
988
builtin/stash.c
+1
-1
@@ -222,7 +222,7 @@ static int clear_stash(int argc, const char **argv, const char *prefix)
222
PARSE_OPT_STOP_AT_NON_OPTION);
223
224
if (argc)
225
- return error(_("git stash clear with parameters is "
225
+ return error(_("git stash clear with arguments is "
226
"unimplemented"));
227
228
return do_clear_stash();
builtin/tag.c
+1
-1
@@ -540,7 +540,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
540
541
object_ref = argc == 2 ? argv[1] : "HEAD";
542
if (argc > 2)
543
- die(_("too many params"));
543
+ die(_("too many arguments"));
544
545
if (get_oid(object_ref, &object))
546
die(_("Failed to resolve '%s' as a valid ref."), object_ref);
t/t3301-notes.sh
+3
-3
@@ -1293,11 +1293,11 @@ test_expect_success 'GIT_NOTES_REWRITE_REF overrides config' '
1293
grep "replacement note 3" actual
1294
'
1295
1296
-test_expect_success 'git notes copy diagnoses too many or too few parameters' '
1296
+test_expect_success 'git notes copy diagnoses too many or too few arguments' '
1297
test_must_fail git notes copy 2>error &&
1298
- test_i18ngrep "too few parameters" error &&
1298
+ test_i18ngrep "too few arguments" error &&
1299
test_must_fail git notes copy one two three 2>error &&
1300
- test_i18ngrep "too many parameters" error
1300
+ test_i18ngrep "too many arguments" error
1301
'
1302
1303
test_expect_success 'git notes get-ref expands refs/heads/master to refs/notes/refs/heads/master' '
t/t6030-bisect-porcelain.sh
+2
-2
@@ -575,9 +575,9 @@ test_expect_success 'skipping away from skipped commit' '
575
test "$para3" = "$PARA_HASH3"
576
'
577
578
-test_expect_success 'erroring out when using bad path parameters' '
578
+test_expect_success 'erroring out when using bad path arguments' '
579
test_must_fail git bisect start $PARA_HASH7 $HASH1 -- foobar 2> error.txt &&
580
- test_i18ngrep "bad path parameters" error.txt
580
+ test_i18ngrep "bad path arguments" error.txt
581
'
582
583
test_expect_success 'test bisection on bare repo - --no-checkout specified' '