提交 471dcfdb 编写于 作者: A Alex Merry 提交者: Junio C Hamano

contrib/completion: "local var=()" is misinterpreted as func-decl by zsh

Certain versions of zsh seems to treat

    local var=()

as a function declaration, rather than an assignment of an empty array,
although its documentation does not suggest that this should be the case.

With zsh 4.3.15 on Fedora Core 15, this causes

  __git_ps1 " (%s)"

to trigger an error message:

  local:2: command not found: svn_url_pattern

when GIT_PS1_SHOWUPSTREAM="auto".
Signed-off-by: NAlex Merry <dev@randomguy3.me.uk>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 75f49651
......@@ -106,9 +106,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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册