development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-13 21:34:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse source 
* maint:
  Rename diff.suppress-blank-empty to diff.suppressBlankEmpty
This commit is contained in:
Junio C Hamano 2009-01-21 01:08:10 -08:00
parent 2b5189e518 950db8798d
commit f873dd5ac2
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/config.txt
View file

@ -635,7 +635,7 @@ diff.renames::
will enable basic rename detection. If set to "copies" or will enable basic rename detection. If set to "copies" or
"copy", it will detect copies, as well. "copy", it will detect copies, as well.
diff.suppress-blank-empty:: diff.suppressBlankEmpty::
A boolean to inhibit the standard behavior of printing a space A boolean to inhibit the standard behavior of printing a space
before each empty output line. Defaults to false. before each empty output line. Defaults to false.

4
diff.c
View file

@ -118,7 +118,9 @@ int git_diff_basic_config(const char *var, const char *value, void *cb)
} }
/* like GNU diff's --suppress-blank-empty option */ /* like GNU diff's --suppress-blank-empty option */
if (!strcmp(var, "diff.suppress-blank-empty")) { if (!strcmp(var, "diff.suppressblankempty") ||
/* for backwards compatibility */
!strcmp(var, "diff.suppress-blank-empty")) {
diff_suppress_blank_empty = git_config_bool(var, value); diff_suppress_blank_empty = git_config_bool(var, value);
return 0; return 0;
} }

8
t/t4029-diff-trailing-space.sh
View file

@ -2,7 +2,7 @@
# #
# Copyright (c) Jim Meyering # 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 . ./test-lib.sh
@ -24,14 +24,14 @@ test_expect_success \
git add f && git add f &&
git commit -q -m. f && git commit -q -m. f &&
printf "\ny\n" > f && printf "\ny\n" > f &&
git config --bool diff.suppress-blank-empty true && git config --bool diff.suppressBlankEmpty true &&
git diff f > actual && git diff f > actual &&
test_cmp exp actual && test_cmp exp actual &&
perl -i.bak -p -e "s/^\$/ /" exp && 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 && git diff f > actual &&
test_cmp exp actual && test_cmp exp actual &&
git config --bool --unset diff.suppress-blank-empty && git config --bool --unset diff.suppressBlankEmpty &&
git diff f > actual && git diff f > actual &&
test_cmp exp actual test_cmp exp actual
' '