diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-02-25 16:43:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-25 16:43:32 -0800 |
| commit | 1c8f5dfa422015e3a5a3cebb06d00ba389bd4d33 (patch) | |
| tree | cba4bc6f97cb34a448adf79a39835c2b382ac677 /t | |
| parent | Merge branch 'ug/doc-commit-approxidate' (diff) | |
| parent | replace "parameters" by "arguments" in error messages (diff) | |
| download | tgif-1c8f5dfa422015e3a5a3cebb06d00ba389bd4d33.tar.xz | |
Merge branch 'js/params-vs-args'
Messages update.
* js/params-vs-args:
replace "parameters" by "arguments" in error messages
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3301-notes.sh | 6 | ||||
| -rwxr-xr-x | t/t6030-bisect-porcelain.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh index 4af881f0ba..d742be8840 100755 --- 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 ef7bdcedf2..0ba5a91b4e 100755 --- 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' ' |