From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-37984-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 21926 invoked by alias); 15 Feb 2016 15:41:54 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 37984
Received: (qmail 27402 invoked from network); 15 Feb 2016 15:41:52 -0000
X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM,
	T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.1
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20120113;
        h=from:content-type:content-transfer-encoding:subject:message-id:date
         :to:mime-version;
        bh=aJ0n3WAbKXwzGteD6Ah1y1aBhOL5mrazYZwEbyQ7sho=;
        b=ekaaJ2Iyelb0h45Lg3qhVPcAIoZztkH0/B3pGr1RpdM1wQJIAvpETbokdvDWpNkNnr
         v2XRU0S8nf8UElMV7bwOGzInhAi3bKcsK1OBArupK0/k0GWb66WWb7CN8XK1vtYbn5ua
         JFzlwpnWDPWSMsrdVSukmNGDMgbO75pfPAxZhIk1Bno7Knfmci0lv0w3ZGi486Y75u35
         EDiNuNcJNxns9ahuwudJB2QBWXPELUayHSTpNx8XMWp+FL5F61mRmrHfhiHsU+XFCU/b
         wW047GQCmuO/Ym3/OL91NfJjO63hC5X6NsipPAJbiq1Xrncm1HzGdJuklJdXj1GRks97
         J1ow==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20130820;
        h=x-gm-message-state:from:content-type:content-transfer-encoding
         :subject:message-id:date:to:mime-version;
        bh=aJ0n3WAbKXwzGteD6Ah1y1aBhOL5mrazYZwEbyQ7sho=;
        b=BsExt8VLsl2FTnQ7uomxRQmUoUkWCn4OeUCd0WQ/GZBlJhjxFRNBANty67PUwFNuLC
         66+ojp8U295dQWo1ZKsXuH8SLvkO7AKwq+7yaV5RWQGsk9fwwh8aOUM5GlnE58ZJNuZX
         dflhiuuiG47+NN++vG4DcM639EhvYq672z91B8RUw9pGf7MewQB7Q2LV1WldZ7pC/Qv9
         wl6tGJePuKSRb5p96uBc3RwfTjLTywmIvNALJVtpXZ1M89jkqg7s5kzBq+n73fxouXTS
         xVODr+R6IQ76u1GagD510VHz3Z45wlp3hFyq1GUiaFoePbHIir1RjPfrCvYgtpKY2b4v
         2pSw==
X-Gm-Message-State: AG10YOSKH6kNvBess+XfVnm3UT8bEVIMCVO3m/ii7lEaEPuxyBMsdXw+kqN5ZtB6adgFuA==
X-Received: by 10.140.144.83 with SMTP id 80mr22253256qhq.102.1455550909520;
        Mon, 15 Feb 2016 07:41:49 -0800 (PST)
From: Thomas Becker <twbecker@gmail.com>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: quoted-printable
Subject: Bug in completion for git merge
Message-Id: <6E7E611B-CA0B-4F79-B775-7D100CA9017B@gmail.com>
Date: Mon, 15 Feb 2016 10:41:48 -0500
To: zsh-workers@zsh.org
Mime-Version: 1.0 (Mac OS X Mail 9.2 \(3112\))
X-Mailer: Apple Mail (2.3112)

There seems to be a bug in the completion for git merge; the completion =
function uses the following statement to both declare and initialize an =
array, which from what I can tell is not allowed:

local -a git_commit_opts=3D(--all --not HEAD --not)

I traced the addition of this to the following patch:

http://www.zsh.org/mla/workers//2015/msg02947.html

The code as written results in the following when invoking tab =
completion on git merge:

arda:~/.dotfiles $ git merge
_git-merge:3: number expected
_git-merge:3: number expected
_git-merge:3: number expected