proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-04 01:41:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2114 from ethomson/crlf_redux

Browse Source 
Never convert CRLF->LF
This commit is contained in:
Vicent Marti 2014-02-12 01:55:25 +01:00
commit 90dd286407
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/crlf.c
View File

@ -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;
/* only LF->CRLF conversion is supported, do nothing on LF platforms */
if (strcmp(workdir_ending, "\r\n") != 0)
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(