From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Mar 2013 21:38:23 +0000 (-0700)
Subject: Merge branch 'rr/tests-dedup-test-config'
X-Git-Tag: v1.8.3-rc0~155
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/4806c8c5cae6864f7a478be3b32b3aa354aaad66?hp=f893be27123ab95590ad568730d22b126cf4bd97

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

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

diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index 082d3e83bd..38a092a0da 100755
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -93,11 +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 \
diff --git a/t/t7811-grep-open.sh b/t/t7811-grep-open.sh
index a8957782cf..e1951a5cbb 100755
--- a/t/t7811-grep-open.sh
+++ b/t/t7811-grep-open.sh
@@ -125,11 +125,6 @@ test_expect_success 'modified file' '
 	test_cmp empty out
 '
 
-test_config() {
-	git config "$1" "$2" &&
-	test_when_finished "git config --unset $1"
-}
-
 test_expect_success 'copes with color settings' '
 	rm -f actual &&
 	echo grep.h >expect &&