Skip to content

Commit f47ff5a

Browse files
committed
Merge branch 'am/completion-zsh-fix'
* am/completion-zsh-fix: contrib/completion: "local var=()" is misinterpreted as func-decl by zsh
2 parents 0df81d8 + 471dcfd commit f47ff5a

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

contrib/completion/git-completion.bash

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,10 @@ __gitdir ()
9494
__git_ps1_show_upstream ()
9595
{
9696
local key value
97-
local svn_remote=() svn_url_pattern count n
97+
local svn_remote svn_url_pattern count n
9898
local upstream=git legacy="" verbose=""
9999

100+
svn_remote=()
100101
# get some config options from git-config
101102
local output="$(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')"
102103
while read -r key value; do

0 commit comments

Comments
 (0)