From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH v3 08/12] convert: CRLF_INPUT is a no-op in the output codepath
Date: Fri, 20 May 2011 23:56:31 -0700 [thread overview]
Message-ID: <1305960995-25738-9-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1305960995-25738-1-git-send-email-gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
convert.c | 2 +-
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;
--
1.7.5.2.369.g8fc017
next prev parent reply other threads:[~2011-05-21 6:57 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-21 6:56 [PATCH v3 00/12] writing out a huge blob to working tree Junio C Hamano
2011-05-21 6:56 ` [PATCH v3 01/12] packed_object_info_detail(): do not return a string Junio C Hamano
2011-05-21 6:56 ` [PATCH v3 02/12] sha1_object_info_extended(): expose a bit more info Junio C Hamano
2011-05-21 6:56 ` [PATCH v3 03/12] sha1_object_info_extended(): hint about objects in delta-base cache Junio C Hamano
2011-05-21 6:56 ` [PATCH v3 04/12] unpack_object_header(): make it public Junio C Hamano
2011-05-21 6:56 ` [PATCH v3 05/12] write_entry(): separate two helper functions out Junio C Hamano
2011-05-21 6:56 ` [PATCH v3 06/12] streaming: a new API to read from the object store Junio C Hamano
2011-05-21 6:56 ` [PATCH v3 07/12] streaming_write_entry(): use streaming API in write_entry() Junio C Hamano
2011-05-21 6:56 ` Junio C Hamano [this message]
2011-05-21 6:56 ` [PATCH v3 09/12] streaming_write_entry(): support files with holes Junio C Hamano
2011-05-21 6:56 ` [PATCH v3 10/12] streaming: read non-delta incrementally from a pack Junio C Hamano
2011-05-21 6:56 ` [PATCH v3 11/12] sha1_file.c: expose helpers to read loose objects Junio C Hamano
2011-05-21 6:56 ` [PATCH v3 12/12] streaming: read loose objects incrementally Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1305960995-25738-9-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).