From: Junio C Hamano Date: Sat, 21 May 2011 06:56:31 GMT Subject: [PATCH v3 08/12] convert: CRLF_INPUT is a no-op in the output codepath Message-ID: <1305960995-25738-9-git-send-email-gitster@pobox.com> In-Reply-To: <1305960995-25738-1-git-send-email-gitster@pobox.com> Signed-off-by: Junio C Hamano --- convert.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/convert.c b/convert.c index d3c0041..264af1d 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; -- 1.7.5.2.369.g8fc017