diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-23 21:36:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-23 21:36:21 (GMT) |
| commit | f47ff5afe4208488c6f977b497b81acdce941afc (patch) | |
| tree | 1be2e221ac4d28d403dec9c75044e56508ef46f1 /contrib | |
| parent | 0df81d860eec53299a43fb8e205caa3cbd813da5 (diff) | |
| parent | 471dcfdbb23ad423168d928335bc36217f9e311d (diff) | |
| download | git-f47ff5afe4208488c6f977b497b81acdce941afc.zip git-f47ff5afe4208488c6f977b497b81acdce941afc.tar.gz git-f47ff5afe4208488c6f977b497b81acdce941afc.tar.bz2 | |
Merge branch 'am/completion-zsh-fix'
* am/completion-zsh-fix:
contrib/completion: "local var=()" is misinterpreted as func-decl by zsh
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index fba076d..31f714d 100755 --- 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 |