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
git-mirror · Oct 27, 2011 · 4801546 · 4801546
2 parents f124fe3 + e5b8eeb
commit 4801546
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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