From b0d9c69f5ee4a626a779d27a33f5565efccd5802 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 20 May 2011 16:14:32 -0700 Subject: [PATCH] convert: CRLF_INPUT is a no-op in the output codepath Signed-off-by: Junio C Hamano --- convert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/convert.c b/convert.c index d3c0041820..264af1d5ba 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;