Commit b033f3a3 by Edward Thomson

Never convert CRLF->LF

Core git performs no conversion on systems that use LF, emulate that.
parent 5d195cf7
...@@ -218,24 +218,11 @@ static int crlf_apply_to_workdir( ...@@ -218,24 +218,11 @@ static int crlf_apply_to_workdir(
if (!workdir_ending) if (!workdir_ending)
return -1; return -1;
if (!strcmp("\n", workdir_ending)) { /* only LF->CRLF conversion is supported, do nothing on LF platforms */
if (ca->crlf_action == GIT_CRLF_GUESS && ca->auto_crlf) if (strcmp(workdir_ending, "\r\n") != 0)
return GIT_PASSTHROUGH; return GIT_PASSTHROUGH;
if (git_buf_find(from, '\r') < 0)
return GIT_PASSTHROUGH;
if (git_buf_text_crlf_to_lf(to, from) < 0)
return -1;
} else {
/* only other supported option is lf->crlf conversion */
assert(!strcmp("\r\n", workdir_ending));
if (git_buf_text_lf_to_crlf(to, from) < 0)
return -1;
}
return 0; return git_buf_text_lf_to_crlf(to, from);
} }
static int crlf_check( static int crlf_check(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment