From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 26 Feb 2021 00:43:32 +0000 (-0800)
Subject: Merge branch 'js/params-vs-args'
X-Git-Tag: v2.31.0-rc0~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c8f5dfa422015e3a5a3cebb06d00ba389bd4d33;p=thirdparty%2Fgit.git

Merge branch 'js/params-vs-args'

Messages update.

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

1c8f5dfa422015e3a5a3cebb06d00ba389bd4d33
diff --cc t/t3301-notes.sh
index 4af881f0ba,f34c14bd8e..d742be8840
--- a/t/t3301-notes.sh
+++ b/t/t3301-notes.sh
@@@ -1293,18 -1293,18 +1293,18 @@@ test_expect_success 'GIT_NOTES_REWRITE_
  	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/master to refs/notes/refs/heads/master' '
 +test_expect_success 'git notes get-ref expands refs/heads/main to refs/notes/refs/heads/main' '
  	test_unconfig core.notesRef &&
  	sane_unset GIT_NOTES_REF &&
 -	echo refs/notes/refs/heads/master >expect &&
 -	git notes --ref=refs/heads/master get-ref >actual &&
 +	echo refs/notes/refs/heads/main >expect &&
 +	git notes --ref=refs/heads/main get-ref >actual &&
  	test_cmp expect actual
  '