Merge branch 'js/prompt-crlf-fix'

gitster · gitster · commit ea58adaeb968 · 2025-08-04T08:10:34.000-07:00
Interactive prompt code did not correctly strip CRLF from the end
of line on Windows.

* js/prompt-crlf-fix:
  interactive: do strip trailing CRLF from input
diff --git a/prompt.c b/prompt.c
@@ -77,12 +77,6 @@ char *git_prompt(const char *prompt, int flags)
 
 int git_read_line_interactively(struct strbuf *line)
 {
-	int ret;
-
 	fflush(stdout);
-	ret = strbuf_getline_lf(line, stdin);
-	if (ret != EOF)
-		strbuf_trim_trailing_newline(line);
-
-	return ret;
+	return strbuf_getline(line, stdin);
 }

Original file line number	Diff line number	Diff line change
`@@ -77,12 +77,6 @@ char git_prompt(const char prompt, int flags)`
`77`	`77`
`78`	`78`	`int git_read_line_interactively(struct strbuf *line)`
`79`	`79`	`{`
`80`		`- int ret;`
`81`		`-`
`82`	`80`	`fflush(stdout);`
`83`		`- ret = strbuf_getline_lf(line, stdin);`
`84`		`- if (ret != EOF)`
`85`		`- strbuf_trim_trailing_newline(line);`
`86`		`-`
`87`		`- return ret;`
	`81`	`+ return strbuf_getline(line, stdin);`
`88`	`82`	`}`