summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-11-09 05:46:39 -0800
committerJunio C Hamano <gitster@pobox.com>2011-11-09 05:46:39 -0800
commit248dbbe83256202f0edd6e1468d01cfbe27fd733 (patch)
treed72c3f3f43930c3c37ca40c14a0c30b5213220c3
parent8a042478967679b0dab3137f5f18367a0ffdc48a (diff)
parent4804d437916d08068143dfc265cc7b5e2f4883e6 (diff)
downloadgit-248dbbe83256202f0edd6e1468d01cfbe27fd733.tar.gz
Merge branch 'sn/complete-bash-wo-process-subst'
* sn/complete-bash-wo-process-subst: completion: don't leak variable from the prompt into environment
-rwxr-xr-xcontrib/completion/git-completion.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 98af8f5c7e..b7c1edf1cc 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)