diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-28 21:38:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-28 21:38:27 (GMT) |
| commit | 631bc94e67383b66da190550866566f09d32f299 (patch) | |
| tree | c673750f55ecf7b658fed0a7fd4da116d53b3e56 /t/t4034-diff-words.sh | |
| parent | 74bd52681d7c57907bef129cdffb6cd0f2895115 (diff) | |
| parent | 790f2827378ef99ce1e7dd9b1d3ce42d222d26bd (diff) | |
| download | git-631bc94e67383b66da190550866566f09d32f299.zip git-631bc94e67383b66da190550866566f09d32f299.tar.gz git-631bc94e67383b66da190550866566f09d32f299.tar.bz2 | |
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
Diffstat (limited to 't/t4034-diff-words.sh')
| -rwxr-xr-x | t/t4034-diff-words.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh index 40ab333..f2f55fc 100755 --- a/t/t4034-diff-words.sh +++ b/t/t4034-diff-words.sh @@ -230,7 +230,7 @@ test_expect_success '.gitattributes override config' ' ' test_expect_success 'setup: remove diff driver regex' ' - test_might_fail git config --unset diff.testdriver.wordRegex + test_unconfig diff.testdriver.wordRegex ' test_expect_success 'use configured regex' ' @@ -335,8 +335,7 @@ test_expect_success 'word-diff with diff.sbe' ' c EOF - test_when_finished "git config --unset diff.suppress-blank-empty" && - git config diff.suppress-blank-empty true && + test_config diff.suppress-blank-empty true && word_diff --word-diff=plain ' @@ -368,7 +367,7 @@ test_expect_success 'setup history with two files' ' test_expect_success 'wordRegex for the first file does not apply to the second' ' echo "*.tex diff=tex" >.gitattributes && - git config diff.tex.wordRegex "[a-z]+|." && + test_config diff.tex.wordRegex "[a-z]+|." && cat >expect <<-\EOF && diff --git a/a.tex b/a.tex --- a/a.tex |