convert: allow core.autocrlf=input and core.eol=crlf

Even though the configuration parser errors out when core.autocrlf
is set to 'input' when core.eol is set to 'crlf', there is no need
to do so, because the core.autocrlf setting trumps core.eol.

Allow all combinations of core.crlf and core.eol and document
that core.autocrlf overrides core.eol.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 2cd6bdd7d2bc2816c1a9aed1c6a26bbd3285777c..4a27ad41cb93da45ffa693d30843c5dafb0d65f8 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -337,9 +337,9 @@ core.quotePath::
 
 core.eol::
        Sets the line ending type to use in the working directory for
 
 core.eol::
        Sets the line ending type to use in the working directory for

-       files that have the `text` property set.  Alternatives are
-       'lf', 'crlf' and 'native', which uses the platform's native
-       line ending.  The default value is `native`.  See
+       files that have the `text` property set when core.autocrlf is false.
+       Alternatives are 'lf', 'crlf' and 'native', which uses the platform's
+       native line ending.  The default value is `native`.  See

        linkgit:gitattributes[5] for more information on end-of-line
        conversion.
 
        linkgit:gitattributes[5] for more information on end-of-line
        conversion.
 

diff --git a/config.c b/config.c
index 9ba40bc1b039b9b65425dc4fa1bd9c7f1fcb0868..a6adc8bc9ecdec9a92aba2bdf80af8b51e4c7863 100644 (file)
--- a/config.c
+++ b/config.c
@@ -803,8 +803,6 @@ static int git_default_core_config(const char *var, const char *value)
 
        if (!strcmp(var, "core.autocrlf")) {
                if (value && !strcasecmp(value, "input")) {
 
        if (!strcmp(var, "core.autocrlf")) {
                if (value && !strcasecmp(value, "input")) {

-                       if (core_eol == EOL_CRLF)
-                               return error("core.autocrlf=input conflicts with core.eol=crlf");

                        auto_crlf = AUTO_CRLF_INPUT;
                        return 0;
                }
                        auto_crlf = AUTO_CRLF_INPUT;
                        return 0;
                }


@@ -830,8 +828,6 @@ static int git_default_core_config(const char *var, const char *value)
                        core_eol = EOL_NATIVE;
                else
                        core_eol = EOL_UNSET;
                        core_eol = EOL_NATIVE;
                else
                        core_eol = EOL_UNSET;

-               if (core_eol == EOL_CRLF && auto_crlf == AUTO_CRLF_INPUT)
-                       return error("core.autocrlf=input conflicts with core.eol=crlf");

                return 0;
        }
 
                return 0;
        }