Merge branch 'jg/prompt-localize-temporary'

gitster · gitster · commit 35b5a8b76999 · 2014-12-22T12:28:20.000-08:00
"git-prompt" (in contrib/) used a variable from the global scope,
possibly contaminating end-user's namespace.

* jg/prompt-localize-temporary:
  git-prompt.sh: make $f local to __git_eread()
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
@@ -270,7 +270,7 @@ __git_ps1_colorize_gitstring ()
 
 __git_eread ()
 {
-	f="$1"
+	local f="$1"
 	shift
 	test -r "$f" && read "$@" <"$f"
 }

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ __git_ps1_colorize_gitstring ()`
`270`	`270`
`271`	`271`	`__git_eread ()`
`272`	`272`	`{`
`273`		`- f="$1"`
	`273`	`+ local f="$1"`
`274`	`274`	`shift`
`275`	`275`	`test -r "$f" && read "$@" <"$f"`
`276`	`276`	`}`