diff options
Diffstat (limited to 'src/crlf.c')
| -rw-r--r-- | src/crlf.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/crlf.c b/src/crlf.c index dad3ecebc..22cba84ab 100644 --- a/src/crlf.c +++ b/src/crlf.c @@ -139,7 +139,9 @@ static int crlf_apply_to_odb( return GIT_PASSTHROUGH; /* If safecrlf is enabled, sanity-check the result. */ - if (stats.cr != stats.crlf || stats.lf != stats.crlf) { + if (stats.cr != stats.crlf || + (stats.crlf > 0 && stats.lf != stats.crlf)) { + switch (ca->safe_crlf) { case GIT_SAFE_CRLF_FAIL: giterr_set( |