diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-12-22 20:28:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-22 20:28:20 (GMT) |
| commit | 35b5a8b76999e3c48c3e01c3fd8559bd447d2dfa (patch) | |
| tree | 0e263409a55575d595da284d824e7bdc44a86ddf /contrib | |
| parent | 3d4eecc87192c78065fb7c2f4ff8c98a33e823ea (diff) | |
| parent | 9dd70e0a0d17aa66c2d95a05952dec05db156fe3 (diff) | |
| download | git-35b5a8b76999e3c48c3e01c3fd8559bd447d2dfa.zip git-35b5a8b76999e3c48c3e01c3fd8559bd447d2dfa.tar.gz git-35b5a8b76999e3c48c3e01c3fd8559bd447d2dfa.tar.bz2 | |
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()
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-prompt.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index c5473dc..729f769 100644 --- 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" } |