Merge branch 'nl/credential-crlf' into jch

gitster · gitster · commit d38830d76d3a · 2020-10-04T12:49:42.000-07:00
Loosen the parser in the receiving end of the credential protocol
to allow credential helper to terminate lines with CRLF line
ending, as well as LF line ending.

* nl/credential-crlf:
  credential: treat CR/LF as line endings in the credential protocol
diff --git a/credential.c b/credential.c
@@ -202,7 +202,7 @@ int credential_read(struct credential *c, FILE *fp)
 {
 	struct strbuf line = STRBUF_INIT;
 
-	while (strbuf_getline_lf(&line, fp) != EOF) {
+	while (strbuf_getline(&line, fp) != EOF) {
 		char *key = line.buf;
 		char *value = strchr(key, '=');
 

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ int credential_read(struct credential c, FILE fp)`
`202`	`202`	`{`
`203`	`203`	`struct strbuf line = STRBUF_INIT;`
`204`	`204`
`205`		`- while (strbuf_getline_lf(&line, fp) != EOF) {`
	`205`	`+ while (strbuf_getline(&line, fp) != EOF) {`
`206`	`206`	`char *key = line.buf;`
`207`	`207`	`char *value = strchr(key, '=');`
`208`	`208`