From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 May 2011 23:14:32 +0000 (-0700)
Subject: convert: CRLF_INPUT is a no-op in the output codepath
X-Git-Tag: v1.7.7-rc0~60^2~14
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b0d9c69f5ee4a626a779d27a33f5565efccd5802;p=git.git

convert: CRLF_INPUT is a no-op in the output codepath

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/convert.c b/convert.c
index d3c004182..264af1d5b 100644
--- a/convert.c
+++ b/convert.c
@@ -831,7 +831,7 @@ int can_bypass_conversion(const char *path)
 		return 0;
 
 	crlf_action = input_crlf_action(ca.crlf_action, ca.eol_attr);
-	if ((crlf_action == CRLF_BINARY) ||
+	if ((crlf_action == CRLF_BINARY) || (crlf_action == CRLF_INPUT) ||
 	    (crlf_action == CRLF_GUESS && auto_crlf == AUTO_CRLF_FALSE))
 		return 1;
 	return 0;