diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-05-20 16:14:32 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-05-20 23:16:53 -0700 |
commit | b0d9c69f5ee4a626a779d27a33f5565efccd5802 (patch) | |
tree | 9d237c11b1b4210d9b5089170c149de794136d97 /convert.c | |
parent | dd8e912190540ef6578386aa1343fbbe196cb8c1 (diff) | |
download | git-b0d9c69f5ee4a626a779d27a33f5565efccd5802.tar.gz |
convert: CRLF_INPUT is a no-op in the output codepath
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'convert.c')
-rw-r--r-- | convert.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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; |