Merge branch 'am/completion-zsh-fix'

* am/completion-zsh-fix:
  contrib/completion: "local var=()" is misinterpreted as func-decl by zsh
This commit is contained in:
Junio C Hamano 2012-03-23 14:36:21 -07:00
commit f47ff5afe4

View File

@ -94,9 +94,10 @@ __gitdir ()
__git_ps1_show_upstream ()
{
local key value
local svn_remote=() svn_url_pattern count n
local svn_remote svn_url_pattern count n
local upstream=git legacy="" verbose=""
svn_remote=()
# get some config options from git-config
local output="$(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')"
while read -r key value; do