summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-27 19:04:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-27 19:04:28 (GMT)
commit48015465287eb5a1240786ae5d0eba67903aa43e (patch)
treec96757ff39d35e0096e5c708254a0c87f3667858
parentf124fe3061d4da53bad3a03fd2875141e8a7a48e (diff)
parente5b8eebc03f80bc21877494ae2ac0c2b63a1b83b (diff)
downloadgit-48015465287eb5a1240786ae5d0eba67903aa43e.zip
git-48015465287eb5a1240786ae5d0eba67903aa43e.tar.gz
git-48015465287eb5a1240786ae5d0eba67903aa43e.tar.bz2
Merge branch 'sn/complete-bash-wo-process-subst'
* sn/complete-bash-wo-process-subst: completion: fix issue with process substitution not working on Git for Windows
-rwxr-xr-xcontrib/completion/git-completion.bash3
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 888e8e1..fc3d0b1 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -110,6 +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 ')"
while read key value; do
case "$key" in
bash.showupstream)
@@ -125,7 +126,7 @@ __git_ps1_show_upstream ()
upstream=svn+git # default upstream is SVN if available, else git
;;
esac
- done < <(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')
+ done <<< "$output"
# parse configuration values
for option in ${GIT_PS1_SHOWUPSTREAM}; do