undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sn/complete-bash-wo-process-subst'

Browse Source 
* sn/complete-bash-wo-process-subst:
  completion: fix issue with process substitution not working on Git for Windows
This commit is contained in:
Junio C Hamano 2011-10-27 12:04:28 -07:00
commit 4801546528
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/completion/git-completion.bash
View File

@ -110,6 +110,7 @@ __git_ps1_show_upstream ()
local upstream=git legacy="" verbose="" local upstream=git legacy="" verbose=""
# get some config options from git-config # 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 while read key value; do
case "$key" in case "$key" in
bash.showupstream) bash.showupstream)
@ -125,7 +126,7 @@ __git_ps1_show_upstream ()
upstream=svn+git # default upstream is SVN if available, else git upstream=svn+git # default upstream is SVN if available, else git
;; ;;
esac esac
done < <(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ') done <<< "$output"
# parse configuration values # parse configuration values
for option in ${GIT_PS1_SHOWUPSTREAM}; do for option in ${GIT_PS1_SHOWUPSTREAM}; do