summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-01 09:19:41 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-01 09:19:42 -0700
commit5753e1709e181c5fbf96ae114481adbaa3129782 (patch)
tree081d858a5d00591eafa3dba244f9d7c8c7e7b68a
parentMerge branch 'yd/doc-is-in-asciidoc' into maint (diff)
parentt4018,7810,7811: remove test_config() redefinition (diff)
downloadtgif-5753e1709e181c5fbf96ae114481adbaa3129782.tar.xz
Merge branch 'rr/tests-dedup-test-config' into maint
* rr/tests-dedup-test-config: t4018,7810,7811: remove test_config() redefinition
-rwxr-xr-xt/t4018-diff-funcname.sh5
-rwxr-xr-xt/t7811-grep-open.sh5
2 files changed, 0 insertions, 10 deletions
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 &&