convert: CRLF_INPUT is a no-op in the output codepath

Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-mirror · May 21, 2011 · b0d9c69 · b0d9c69
1 parent dd8e912
commit b0d9c69
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;