diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-11-09 05:46:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-09 05:46:39 -0800 |
| commit | 248dbbe83256202f0edd6e1468d01cfbe27fd733 (patch) | |
| tree | d72c3f3f43930c3c37ca40c14a0c30b5213220c3 /contrib/completion | |
| parent | 8a042478967679b0dab3137f5f18367a0ffdc48a (diff) | |
| parent | 4804d437916d08068143dfc265cc7b5e2f4883e6 (diff) | |
| download | git-248dbbe83256202f0edd6e1468d01cfbe27fd733.tar.gz git-248dbbe83256202f0edd6e1468d01cfbe27fd733.tar.xz | |
Merge branch 'sn/complete-bash-wo-process-subst'
* sn/complete-bash-wo-process-subst:
completion: don't leak variable from the prompt into environment
Diffstat (limited to 'contrib/completion')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 98af8f5c7..b7c1edf1c 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -110,7 +110,7 @@ __git_ps1_show_upstream () local upstream=git legacy="" verbose="" # get some config options from git-config - output="$(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')" + local output="$(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')" while read key value; do case "$key" in bash.showupstream) |