Merge branch 'rr/tests-dedup-test-config'

* rr/tests-dedup-test-config:
  t4018,7810,7811: remove test_config() redefinition

diff --combined t/t4018-diff-funcname.sh
index 082d3e83bddf242fb02f5124fd52d125520af6b8,9b5db6c77b2299a0b8efa9d462bed7bfffed8e47..38a092a0dadbe09b903484c1d34e240a9d819c77
--- 1/t/t4018-diff-funcname.sh
--- 2/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@@ -93,11 -93,6 +93,6 @@@ sed -e 
        s/song;/song();/
  ' <Beer.perl >Beer-correct.perl
  
- test_config () {
-       git config "$1" "$2" &&
-       test_when_finished "git config --unset $1"
- }
- 
  test_expect_funcname () {
        lang=${2-java}
        test_expect_code 1 git diff --no-index -U1 \
@@@ -105,7 -100,7 +100,7 @@@
        grep "^@@.*@@ $1" diff
  }
  
 -for p in bibtex cpp csharp fortran html java matlab objc pascal perl php python ruby tex
 +for p in ada bibtex cpp csharp fortran html java matlab objc pascal perl php python ruby tex
  do
        test_expect_success "builtin $p pattern compiles" '
                echo "*.java diff=$p" >.gitattributes &&