Skip to content

Commit

Permalink
convert.c: use text_eol_is_crlf()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Torsten Bögershausen authored and Junio C Hamano committed Feb 8, 2016
1 parent bb211b4 commit 4b4024f
Showing 1 changed file with 14 additions and 6 deletions.
20 changes: 14 additions & 6 deletions convert.c
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,19 @@ const char *get_wt_convert_stats_ascii(const char *path)
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) {
Expand All @@ -164,12 +177,7 @@ static enum eol output_eol(enum crlf_action crlf_action)
/* 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;
}
Expand Down

0 comments on commit 4b4024f

Please sign in to comment.