From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Mar 2013 21:38:27 +0000 (-0700)
Subject: Merge branch 'yd/use-test-config-unconfig'
X-Git-Tag: v1.8.3-rc0~153
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=631bc94e67383b66da190550866566f09d32f299;p=thirdparty%2Fgit.git

Merge branch 'yd/use-test-config-unconfig'

Bulk-update of the test suite.

* yd/use-test-config-unconfig:
  t5520: use test_config to set/unset git config variables (leftover bits)
  t7600: use test_config to set/unset git config variables
  t7502: remove clear_config
  t7502: use test_config to set/unset git config variables
  t9500: use test_config to set/unset git config variables
  t7508: use test_config to set/unset git config variables
  t7500: use test_config to set/unset git config variables
  t5541: use test_config to set/unset git config variables
  t5520: use test_config to set/unset git config variables
  t4202: use test_config/test_unconfig to set/unset git config variables
  t4034: use test_config/test_unconfig to set/unset git config variables
  t4304: use test_config to set/unset git config variables
  t3400: use test_config to set/unset git config variables
---

631bc94e67383b66da190550866566f09d32f299
diff --cc t/t7502-commit.sh
index f9b44b7244,b0ae705936..256137f07a
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh
@@@ -171,21 -171,11 +171,20 @@@ test_expect_success 'verbose' 
  
  test_expect_success 'verbose respects diff config' '
  
- 	git config color.diff always &&
+ 	test_config color.diff always &&
  	git status -v >actual &&
- 	grep "\[1mdiff --git" actual &&
- 	git config --unset color.diff
+ 	grep "\[1mdiff --git" actual
  '
  
 +mesg_with_comment_and_newlines='
 +# text
 +
 +'
 +
 +test_expect_success 'prepare file with comment line and trailing newlines'  '
 +	printf "%s" "$mesg_with_comment_and_newlines" >expect
 +'
 +
  test_expect_success 'cleanup commit messages (verbatim option,-t)' '
  
  	echo >>negative &&