[PATCH v3 5/7] convert: auto_crlf=false and no attributes set: same as binary
From: <hidden>
Date: 2016-06-15 23:08:07
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH v3 5/7] convert: auto_crlf=false and no attributes set: same as binary · Torsten Bögershausen <hidden>
- 2016-06-15 · Re: [PATCH v3 5/7] convert: auto_crlf=false and no attributes set: same as binary · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH v3 5/7] convert: auto_crlf=false and no attributes set: same as binary · Junio C Hamano <hidden>
From: Torsten Bögershausen <redacted> When core.autocrlf is set to false, and no attributes are set, the file is treated as binary. Simplify the logic and remove duplicated code when dealing with (crlf_action == CRLF_GUESS && auto_crlf == AUTO_CRLF_FALSE) by setting crlf_action=CRLF_BINARY already in convert_attrs(). Signed-off-by: Torsten Bögershausen <redacted> --- convert.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/convert.c b/convert.c
index 557e574..e9c9448 100644
--- a/convert.c
+++ b/convert.c@@ -235,7 +235,6 @@ static int crlf_to_git(const char *path, const char *src, size_t len, char *dst; if (crlf_action == CRLF_BINARY || - (crlf_action == CRLF_GUESS && auto_crlf == AUTO_CRLF_FALSE) || (src && !len)) return 0;
@@ -798,6 +797,8 @@ static void convert_attrs(struct conv_attrs *ca, const char *path) ca->crlf_action = CRLF_GUESS; ca->ident = 0; } + if (ca->crlf_action == CRLF_GUESS && auto_crlf == AUTO_CRLF_FALSE) + ca->crlf_action = CRLF_BINARY; } int would_convert_to_git_filter_fd(const char *path)
@@ -1382,8 +1383,7 @@ struct stream_filter *get_stream_filter(const char *path, const unsigned char *s crlf_action = ca.crlf_action; - if ((crlf_action == CRLF_BINARY) || (crlf_action == CRLF_INPUT) || - (crlf_action == CRLF_GUESS && auto_crlf == AUTO_CRLF_FALSE)) + if ((crlf_action == CRLF_BINARY) || (crlf_action == CRLF_INPUT)) filter = cascade_filter(filter, &null_filter_singleton); else if (output_eol(crlf_action) == EOL_CRLF &&
--
2.7.0.303.g2c4f448.dirty