Rename diff.suppress-blank-empty to diff.suppressBlankEmpty

All the other config variables use CamelCase.  This config variable should
not be an exception.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 52786c7df5eb902cf97fee165ceb25e3c4763e9e..26551ea6e1bba817bc272243368e082fecaca2f1 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -635,7 +635,7 @@ diff.renames::
        will enable basic rename detection.  If set to "copies" or
        "copy", it will detect copies, as well.
 
        will enable basic rename detection.  If set to "copies" or
        "copy", it will detect copies, as well.
 

-diff.suppress-blank-empty::
+diff.suppressBlankEmpty::

        A boolean to inhibit the standard behavior of printing a space
        before each empty output line. Defaults to false.
 
        A boolean to inhibit the standard behavior of printing a space
        before each empty output line. Defaults to false.
 

diff --git a/diff.c b/diff.c
index 0484601f42a8aeac408d560091d341f571f231dd..5b85b4077a1d3e333d6af86127bf9473b295c837 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -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);
                return 0;
        }
                diff_suppress_blank_empty = git_config_bool(var, value);
                return 0;
        }

diff --git a/t/t4029-diff-trailing-space.sh b/t/t4029-diff-trailing-space.sh
index 4ca65e033289fe4ac757a3f19ecd3169bdb434e4..9ddbbcde57489e266e2f229314ebac5dbfeb3be6 100755 (executable)
--- a/t/t4029-diff-trailing-space.sh
+++ b/t/t4029-diff-trailing-space.sh
@@ -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 commit -q -m. f &&
      printf "\ny\n" > f &&
      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 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 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
      '
      git diff f > actual &&
      test_cmp exp actual
      '