convert: CRLF_INPUT is a no-op in the output codepath
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
May 20, 2011 at 16:14 UTC
b0d9c69f5ee4a626a779d27a33f5565efccd5802
1 file changed
+1
-1
convert.c
+1
-1
@@ -831,7 +831,7 @@ int can_bypass_conversion(const char *path)
831
return 0;
832
833
crlf_action = input_crlf_action(ca.crlf_action, ca.eol_attr);
834
- if ((crlf_action == CRLF_BINARY) ||
834
+ if ((crlf_action == CRLF_BINARY) || (crlf_action == CRLF_INPUT) ||
835
(crlf_action == CRLF_GUESS && auto_crlf == AUTO_CRLF_FALSE))
836
return 1;
837
return 0;