Merge branch 'ek/completion-use-read-r-to-read-literally'

gitster · gitster · commit 4ca12e10e6fb · 2023-05-02T10:13:34.000-07:00
The completion script used to use bare "read" without the "-r"
option to read the contents of various state files, which risked
getting confused with backslashes in them.  This has been
corrected.

* ek/completion-use-read-r-to-read-literally:
  completion: suppress unwanted unescaping of `read`
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
@@ -298,7 +298,7 @@ __git_ps1_colorize_gitstring ()
 # variable, in that order.
 __git_eread ()
 {
-	test -r "$1" && IFS=$'\r\n' read "$2" <"$1"
+	test -r "$1" && IFS=$'\r\n' read -r "$2" <"$1"
 }
 
 # see if a cherry-pick or revert is in progress, if the user has committed a

Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ __git_ps1_colorize_gitstring ()`
`298`	`298`	`# variable, in that order.`
`299`	`299`	`__git_eread ()`
`300`	`300`	`{`
`301`		`- test -r "$1" && IFS=$'\r\n' read "$2" <"$1"`
	`301`	`+ test -r "$1" && IFS=$'\r\n' read -r "$2" <"$1"`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`# see if a cherry-pick or revert is in progress, if the user has committed a`