Commit 7be1caf7f54bff938c71a616f38e9ac375a0b137
2014-04-07T21:41:36
Determine crlf safety by statistics, not literal reversibility
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
diff --git a/src/crlf.c b/src/crlf.c
index 645ada2..8be1b9a 100644
--- a/src/crlf.c
+++ b/src/crlf.c
@@ -124,9 +124,6 @@ static int crlf_apply_to_odb(
const git_buf *from,
const git_filter_source *src)
{
- git_buf safe = GIT_BUF_INIT;
- int error = 0;
-
/* Empty file? Nothing to do */
if (!git_buf_len(from))
return 0;
@@ -141,6 +138,13 @@ static int crlf_apply_to_odb(
if (git_buf_text_gather_stats(&stats, from, false))
return GIT_PASSTHROUGH;
+ /* If safecrlf is enabled, sanity-check the result. */
+ if (ca->safe_crlf && (stats.cr != stats.crlf || stats.lf != stats.crlf)) {
+ giterr_set(GITERR_FILTER, "LF would be replaced by CRLF in '%s'",
+ git_filter_source_path(src));
+ return -1;
+ }
+
/*
* We're currently not going to even try to convert stuff
* that has bare CR characters. Does anybody do that crazy
@@ -158,31 +162,12 @@ static int crlf_apply_to_odb(
return GIT_PASSTHROUGH;
}
- if (!stats.cr && !ca->safe_crlf)
+ if (!stats.cr)
return GIT_PASSTHROUGH;
}
/* Actually drop the carriage returns */
- if ((error = git_buf_text_crlf_to_lf(to, from)) < 0)
- return error;
-
- /* If safecrlf is enabled, sanity-check the result. */
- if (ca->safe_crlf) {
- if ((error = git_buf_grow(&safe, max(from->size, to->size))) < 0 ||
- (error = git_buf_text_lf_to_crlf(&safe, to)) < 0)
- goto done;
-
- if (git_buf_cmp(from, &safe) != 0) {
- giterr_set(GITERR_FILTER, "LF would be replaced by CRLF in '%s'",
- git_filter_source_path(src));
- error = -1;
- }
- }
-
-done:
- git_buf_free(&safe);
-
- return error;
+ return git_buf_text_crlf_to_lf(to, from);
}
static const char *line_ending(struct crlf_attrs *ca)