git-prompt: fix reading files with windows line endings

Tauwasser · gitster · commit 041fe8fc8377 · 2017-12-06T10:08:13.000-08:00
If any of the files read by __git_eread have \r\n line endings, read
will only strip \n, leaving \r. This results in an ugly prompt, where
instead of

    user@pc MINGW64 /path/to/repo (BARE:master)

the last parenthesis is printed over the beginning of the prompt like

    )ser@pc MINGW64 /path/to/repo (BARE:master

This patch fixes the issue by changing the internal field separator
variable IFS to $'\r\n' before using the read builtin command.

Note that ANSI-C Quoting/POSIX Quoting ($'...') is supported by bash
as well as zsh, which are the current targets of git-prompt, cf.
contrib/completion/git-prompt.sh.

Signed-off-by: Robert Abel &lt;rabel@robertabel.eu&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
@@ -283,7 +283,7 @@ __git_ps1_colorize_gitstring ()
 # variable, in that order.
 __git_eread ()
 {
-	test -r "$1" && read "$2" <"$1"
+	test -r "$1" && IFS=$'\r\n' read "$2" <"$1"
 }
 
 # __git_ps1 accepts 0 or 1 arguments (i.e., format string)

Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ __git_ps1_colorize_gitstring ()`
`283`	`283`	`# variable, in that order.`
`284`	`284`	`__git_eread ()`
`285`	`285`	`{`
`286`		`- test -r "$1" && read "$2" <"$1"`
	`286`	`+ test -r "$1" && IFS=$'\r\n' read "$2" <"$1"`
`287`	`287`	`}`
`288`	`288`
`289`	`289`	`# __git_ps1 accepts 0 or 1 arguments (i.e., format string)`