Merge branch 'am/completion-zsh-fix'

* am/completion-zsh-fix: contrib/completion: "local var=()" is misinterpreted as func-decl by zsh
git-mirror · Mar 23, 2012 · f47ff5a · f47ff5a
2 parents 0df81d8 + 471dcfd
commit f47ff5a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
@@ -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