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

* rr/tests-dedup-test-config:
  t4018,7810,7811: remove test_config() redefinition
This commit is contained in:
Junio C Hamano 2013-04-01 09:19:41 -07:00
commit 5753e1709e
2 changed files with 0 additions and 10 deletions

View file

@ -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 \

View file

@ -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 &&