From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Dec 2014 20:28:20 +0000 (-0800)
Subject: Merge branch 'jg/prompt-localize-temporary'
X-Git-Tag: v2.3.0-rc0~38
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/35b5a8b76999e3c48c3e01c3fd8559bd447d2dfa?hp=--cc

Merge branch 'jg/prompt-localize-temporary'

"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()
---

35b5a8b76999e3c48c3e01c3fd8559bd447d2dfa
diff --cc contrib/completion/git-prompt.sh
index c5473dc8db,dba928ed00..729f769479
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@@ -268,9 -259,9 +268,9 @@@ __git_ps1_colorize_gitstring (
  	r="$c_clear$r"
  }
  
 -eread ()
 +__git_eread ()
  {
- 	f="$1"
+ 	local f="$1"
  	shift
  	test -r "$f" && read "$@" <"$f"
  }