From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Apr 2013 16:19:41 +0000 (-0700)
Subject: Merge branch 'rr/tests-dedup-test-config' into maint
X-Git-Tag: v1.8.2.1~20
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5753e1709e181c5fbf96ae114481adbaa3129782?ds=inline;hp=-c

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

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

5753e1709e181c5fbf96ae114481adbaa3129782
diff --combined t/t4018-diff-funcname.sh
index 082d3e83bd,9b5db6c77b..38a092a0da
--- a/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 &&