Andrew's git / gitweb.git / diff
?
convert: CRLF_INPUT is a no-op in the output codepath
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 May 2011 23:14:32 +0000 (16:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 21 May 2011 06:16:53 +0000 (23:16 -0700)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
convert.c patch | blob | history
diff --git a/convert.c b/convert.c
index d3c0041820b8734c56e17b01b51a695142ec2055..264af1d5ba0924bd867962d2337bb5c019b87d81 100644 (file)
--- 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;