Skip to content

Commit

Permalink
Never convert CRLF->LF
Browse files Browse the repository at this point in the history
Core git performs no conversion on systems that use LF, emulate that.
  • Loading branch information
Edward Thomson committed Feb 12, 2014
1 parent 5d195cf commit b033f3a
Showing 1 changed file with 4 additions and 17 deletions.
21 changes: 4 additions & 17 deletions src/crlf.c
Original file line number Diff line number Diff line change
Expand Up @@ -218,24 +218,11 @@ static int crlf_apply_to_workdir(
if (!workdir_ending)
return -1;

if (!strcmp("\n", workdir_ending)) {
if (ca->crlf_action == GIT_CRLF_GUESS && ca->auto_crlf)
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;
}
/* only LF->CRLF conversion is supported, do nothing on LF platforms */
if (strcmp(workdir_ending, "\r\n") != 0)
return GIT_PASSTHROUGH;

return 0;
return git_buf_text_lf_to_crlf(to, from);
}

static int crlf_check(
Expand Down

0 comments on commit b033f3a

Please sign in to comment.