proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-29 22:25:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

crlf: use statistics to control to workdir filter

Browse Source 
Use statistics (like core git) to control the behavior of the
to workdir CRLF filter.
This commit is contained in:
Edward Thomson 2015-06-08 15:58:54 -04:00
parent 71686ddca6
commit 47e9a6cb05
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/crlf.c
View File

@ -224,16 +224,14 @@ line_ending_error:
static int crlf_apply_to_workdir( static int crlf_apply_to_workdir(
struct crlf_attrs *ca, git_buf *to, const git_buf *from) struct crlf_attrs *ca, git_buf *to, const git_buf *from)
{ {
git_buf_text_stats stats;
const char *workdir_ending = NULL; const char *workdir_ending = NULL;
bool is_binary;
/* Empty file? Nothing to do. */ /* Empty file? Nothing to do. */
if (git_buf_len(from) == 0) if (git_buf_len(from) == 0)
return 0; return 0;
/* Don't filter binary files */
if (git_buf_text_is_binary(from))
return GIT_PASSTHROUGH;
/* Determine proper line ending */ /* Determine proper line ending */
workdir_ending = line_ending(ca); workdir_ending = line_ending(ca);
if (!workdir_ending) if (!workdir_ending)
@ -243,6 +241,29 @@ static int crlf_apply_to_workdir(
if (strcmp(workdir_ending, "\r\n") != 0) if (strcmp(workdir_ending, "\r\n") != 0)
return GIT_PASSTHROUGH; return GIT_PASSTHROUGH;
/* If there are no LFs, or all LFs are part of a CRLF, nothing to do */
is_binary = git_buf_text_gather_stats(&stats, from, false);
if (stats.lf == 0 || stats.lf == stats.crlf)
return GIT_PASSTHROUGH;
if (ca->crlf_action == GIT_CRLF_AUTO ||
ca->crlf_action == GIT_CRLF_GUESS) {
/* If we have any existing CR or CRLF line endings, do nothing */
if (ca->crlf_action == GIT_CRLF_GUESS &&
stats.cr > 0 && stats.crlf > 0)
return GIT_PASSTHROUGH;
/* If we have bare CR characters, do nothing */
if (stats.cr != stats.crlf)
return GIT_PASSTHROUGH;
/* Don't filter binary files */
if (is_binary)
return GIT_PASSTHROUGH;
}
return git_buf_text_lf_to_crlf(to, from); return git_buf_text_lf_to_crlf(to, from);
} }