convert.c: use text_eol_is_crlf()

Add a helper function to find out, which line endings text files
should get at checkout, depending on core.autocrlf and core.eol
configuration variables.

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

diff --git a/convert.c b/convert.c
index d0c8c6620da4d275660ad4d8dc2ac519e3f11666..557e574da60fee6302140fbcb9e154e1cafd5253 100644 (file)
--- a/convert.c
+++ b/convert.c
@@ -149,6 +149,19 @@ const char *get_wt_convert_stats_ascii(const char *path)
        return ret;
 }
 
        return ret;
 }
 

+static int text_eol_is_crlf(void)
+{
+       if (auto_crlf == AUTO_CRLF_TRUE)
+               return 1;
+       else if (auto_crlf == AUTO_CRLF_INPUT)
+               return 0;
+       if (core_eol == EOL_CRLF)
+               return 1;
+       if (core_eol == EOL_UNSET && EOL_NATIVE == EOL_CRLF)
+               return 1;
+       return 0;
+}
+

 static enum eol output_eol(enum crlf_action crlf_action)
 {
        switch (crlf_action) {
 static enum eol output_eol(enum crlf_action crlf_action)
 {
        switch (crlf_action) {


@@ -164,12 +177,7 @@ static enum eol output_eol(enum crlf_action crlf_action)
                /* fall through */
        case CRLF_TEXT:
        case CRLF_AUTO:
                /* fall through */
        case CRLF_TEXT:
        case CRLF_AUTO:

-               if (auto_crlf == AUTO_CRLF_TRUE)
-                       return EOL_CRLF;
-               else if (auto_crlf == AUTO_CRLF_INPUT)
-                       return EOL_LF;
-               else if (core_eol == EOL_UNSET)
-                       return EOL_NATIVE;
+               return text_eol_is_crlf() ? EOL_CRLF : EOL_LF;

        }
        return core_eol;
 }
        }
        return core_eol;
 }