Just don't CRLF filter if there are no CRs

ecoffey · May 19, 2014 · c094197 · c094197
1 parent 16798d0
commit c094197
Showing 1 changed file with 5 additions and 3 deletions.
diff --git 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(