summaryrefslogtreecommitdiff
path: root/convert.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-20 23:14:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-21 06:16:53 (GMT)
commitb0d9c69f5ee4a626a779d27a33f5565efccd5802 (patch)
tree9d237c11b1b4210d9b5089170c149de794136d97 /convert.c
parentdd8e912190540ef6578386aa1343fbbe196cb8c1 (diff)
downloadgit-b0d9c69f5ee4a626a779d27a33f5565efccd5802.zip
git-b0d9c69f5ee4a626a779d27a33f5565efccd5802.tar.gz
git-b0d9c69f5ee4a626a779d27a33f5565efccd5802.tar.bz2
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.c2
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;