summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Naewe <stefan.naewe@gmail.com>2011-10-26 19:13:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-26 21:05:47 (GMT)
commite5b8eebc03f80bc21877494ae2ac0c2b63a1b83b (patch)
tree419154fab522e0df38e48adac1ca128bb512ee4d
parentf384a2edd62dfc4af0f051dc8248506cebb265f9 (diff)
downloadgit-e5b8eebc03f80bc21877494ae2ac0c2b63a1b83b.zip
git-e5b8eebc03f80bc21877494ae2ac0c2b63a1b83b.tar.gz
git-e5b8eebc03f80bc21877494ae2ac0c2b63a1b83b.tar.bz2
completion: fix issue with process substitution not working on Git for Windows
Git for Windows comes with a bash that doesn't support process substitution. It issues the following error when using git-completion.bash with GIT_PS1_SHOWUPSTREAM set: $ export GIT_PS1_SHOWUPSTREAM=1 sh.exe": cannot make pipe for process substitution: Function not implemented sh.exe": cannot make pipe for process substitution: Function not implemented sh.exe": <(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n '): ambiguous redirect Replace the process substitution with a 'here string'. Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-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