diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-21 01:08:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-21 01:08:10 -0800 |
| commit | f873dd5ac22fee648f9097d5a91200b6f4850ae0 (patch) | |
| tree | effdbc042e8919b36c92faca7707f84bbbac2a07 /t/t4029-diff-trailing-space.sh | |
| parent | 2b5189e51855312a91dd23b5e7311c48944bc382 (diff) | |
| parent | 950db8798d51cb183c858938263425b367b21dfd (diff) | |
| download | git-f873dd5ac22fee648f9097d5a91200b6f4850ae0.tar.gz | |
Merge branch 'maint'
* maint:
Rename diff.suppress-blank-empty to diff.suppressBlankEmpty
Diffstat (limited to 't/t4029-diff-trailing-space.sh')
| -rwxr-xr-x | t/t4029-diff-trailing-space.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t4029-diff-trailing-space.sh b/t/t4029-diff-trailing-space.sh index 4ca65e0332..9ddbbcde57 100755 --- a/t/t4029-diff-trailing-space.sh +++ b/t/t4029-diff-trailing-space.sh @@ -2,7 +2,7 @@ # # Copyright (c) Jim Meyering # -test_description='diff honors config option, diff.suppress-blank-empty' +test_description='diff honors config option, diff.suppressBlankEmpty' . ./test-lib.sh @@ -24,14 +24,14 @@ test_expect_success \ git add f && git commit -q -m. f && printf "\ny\n" > f && - git config --bool diff.suppress-blank-empty true && + git config --bool diff.suppressBlankEmpty true && git diff f > actual && test_cmp exp actual && perl -i.bak -p -e "s/^\$/ /" exp && - git config --bool diff.suppress-blank-empty false && + git config --bool diff.suppressBlankEmpty false && git diff f > actual && test_cmp exp actual && - git config --bool --unset diff.suppress-blank-empty && + git config --bool --unset diff.suppressBlankEmpty && git diff f > actual && test_cmp exp actual ' |