From c094197bf92736bb1c40cf1ca87bda970ab7f999 Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Mon, 19 May 2014 15:05:39 -0700 Subject: [PATCH] Just don't CRLF filter if there are no CRs --- src/crlf.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/crlf.c b/src/crlf.c index 22cba84ab..821e04eb2 100644 --- a/src/crlf.c +++ b/src/crlf.c @@ -138,10 +138,12 @@ static int crlf_apply_to_odb( if (git_buf_text_gather_stats(&stats, from, false)) return GIT_PASSTHROUGH; - /* If safecrlf is enabled, sanity-check the result. */ - if (stats.cr != stats.crlf || - (stats.crlf > 0 && stats.lf != stats.crlf)) { + /* If there are no CR characters to filter out, then just pass */ + if (!stats.cr) + return GIT_PASSTHROUGH; + /* If safecrlf is enabled, sanity-check the result. */ + if (stats.cr != stats.crlf || stats.lf != stats.crlf) { switch (ca->safe_crlf) { case GIT_SAFE_CRLF_FAIL: giterr_set(