convert: add SAFE_CRLF_KEEP_CRLF

tboegi · gitster · commit 2fea9de61857 · 2017-08-16T10:21:17.000-07:00
When convert_to_git() is called, the caller may want to keep CRLF to
be kept as CRLF (and not converted into LF).

This will be used in the next commit, when apply works with files
that have CRLF and patches are applied onto these files.

Add the new value "SAFE_CRLF_KEEP_CRLF" to safe_crlf.

Prepare convert_to_git() to be able to run the clean filter, skip
the CRLF conversion and run the ident filter.

Signed-off-by: Torsten Bögershausen &lt;tboegi@web.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/convert.c b/convert.c
@@ -1104,10 +1104,12 @@ int convert_to_git(const struct index_state *istate,
 		src = dst->buf;
 		len = dst->len;
 	}
-	ret |= crlf_to_git(istate, path, src, len, dst, ca.crlf_action, checksafe);
-	if (ret && dst) {
-		src = dst->buf;
-		len = dst->len;
+	if (checksafe != SAFE_CRLF_KEEP_CRLF) {
+		ret |= crlf_to_git(istate, path, src, len, dst, ca.crlf_action, checksafe);
+		if (ret && dst) {
+			src = dst->buf;
+			len = dst->len;
+		}
 	}
 	return ret | ident_to_git(path, src, len, dst, ca.ident);
 }
diff --git a/convert.h b/convert.h
@@ -10,7 +10,8 @@ enum safe_crlf {
 	SAFE_CRLF_FALSE = 0,
 	SAFE_CRLF_FAIL = 1,
 	SAFE_CRLF_WARN = 2,
-	SAFE_CRLF_RENORMALIZE = 3
+	SAFE_CRLF_RENORMALIZE = 3,
+	SAFE_CRLF_KEEP_CRLF = 4
 };
 
 extern enum safe_crlf safe_crlf;

Original file line number	Diff line number	Diff line change
`@@ -1104,10 +1104,12 @@ int convert_to_git(const struct index_state *istate,`
`1104`	`1104`	`src = dst->buf;`
`1105`	`1105`	`len = dst->len;`
`1106`	`1106`	`}`
`1107`		`- ret \|= crlf_to_git(istate, path, src, len, dst, ca.crlf_action, checksafe);`
`1108`		`- if (ret && dst) {`
`1109`		`- src = dst->buf;`
`1110`		`- len = dst->len;`
	`1107`	`+ if (checksafe != SAFE_CRLF_KEEP_CRLF) {`
	`1108`	`+ ret \|= crlf_to_git(istate, path, src, len, dst, ca.crlf_action, checksafe);`
	`1109`	`+ if (ret && dst) {`
	`1110`	`+ src = dst->buf;`
	`1111`	`+ len = dst->len;`
	`1112`	`+ }`
`1111`	`1113`	`}`
`1112`	`1114`	`return ret \| ident_to_git(path, src, len, dst, ca.ident);`
`1113`	`1115`	`}`