Merge branch 'jg/prompt-localize-temporary'
commit35b5a8b76999e3c48c3e01c3fd8559bd447d2dfa
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:28:20 +0000 (22 12:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:28:20 +0000 (22 12:28 -0800)
tree0e263409a55575d595da284d824e7bdc44a86ddf
parent3d4eecc87192c78065fb7c2f4ff8c98a33e823ea
parent9dd70e0a0d17aa66c2d95a05952dec05db156fe3
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()
contrib/completion/git-prompt.sh