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-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
	autolearn=ham autolearn_force=no version=3.4.1
Subject: Re: Bug in completion for git merge
To: zsh-workers@zsh.org
References: <6E7E611B-CA0B-4F79-B775-7D100CA9017B@gmail.com>
 <160215085854.ZM27144@torch.brasslantern.com>
 <8D34A413-897D-4D27-8FD4-4958FC0A90C4@gmail.com>
From: Eric Cook <llua@gmx.com>
X-Enigmail-Draft-Status: N1110
Message-ID: <56C29140.304@gmx.com>
Date: Mon, 15 Feb 2016 22:02:24 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101
 Thunderbird/38.5.1
MIME-Version: 1.0
In-Reply-To: <8D34A413-897D-4D27-8FD4-4958FC0A90C4@gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K0:eBEsCsFNRMJagbCQadKgk8oNgxlEhXgixpvPXe3IWOgE08xT2qL
 wVFKX0EeDcP7ko8G/WERqlp5/Ip1I/8S2MWwaO799/a4iWjrkmUBAetTFzTQRVykux5eLZX
 De42YOcfFCqC7jsj+h/CUJ84f4lNAi6Pgy+k0WGG2RQ7seCyuSnzwXRGLOC2f70pHbXTo2D
 T4iPwDAUjTVyqQ8Nh9arw==
X-UI-Out-Filterresults: notjunk:1;V01:K0:ohG33OGrtyU=:S9Lr3NfH+qrgLN41cmHloK
 AYvZ8Z94Vr81x+9AshoHX5rpCPxeOlWYl0LCYtyH82JoQbasFi+IMoQ7Fvkd/pR/blld3LcY9
 e0bfqnEXO42qvg29OLCQRh0alXEPT9O1gjrh0fi8avr+UviXtbi6nvxC97gI9KUJ3Q1BuBU9U
 JAsRxFK2lnHzoAMqdD99Xy8PtnDDLLt7R6QYlm7kdEG38RSxsrKYef5vOewffVBQd0QuqOrXb
 KXgGe+1xyrmRz74yWwrIEjTV86t5m+odZsf6oo59dgWwI4O/bOf3raRs4zfVGkcJc1dBAvSpp
 2FdkdFaaq0GJb3SgbrM5j2BxISQokTB4TVPmQjIHfhwerKx0h0E4uw4RfyBAsYuG/erdU+mxq
 Cik8mBtE6jADh5DkHgocsdHarh/LNfTqeLfuxLWRn5JlGcbzchn8sb4B77wepaFsEmKFHNj0L
 vln1J50cNZSEomHpU4mWlhbpIEd7JLpN2XNuZjrD2WmZxXwfm5waSb/JYV+XMa+WFPcw3MLnr
 I9/LUBygMtRfzwxTm0XadSw9iqdthkXDfPWBYCoMNBTH9UtoB0HnLaJLwiG/D+EhEamSptVoo
 k/ZdnH+Kxc6x9qIpmc4254Cc0T8n9zCFljDsQZ66l6RtMXEanMe4tA4uX+lVw2u12DZ1DwX2o
 cR9jPA4o+twq2KdX7JcSwcn4nj839bUOk1beNB5Z3iGFNL4Si3Cg/hqFWswqpCEMMGMMUQEiD
 h7Ti6vT0m9USX0J9XLjljm6PUDf/LbZs7y5K6P8OHRd+C8giw7yzXyYfypvMhF2MfiVgvmhu8
 SJiowqm
X-Seq: zsh-workers 37991

On 02/15/2016 12:20 PM, Thomas Becker wrote:
> Ahh sorry about that.  That explains some of the other weirdness I’ve been seeing. I’m trying to upgrade my completion to something that knows about newer git options than what is provided in 5.0.5. Is there any way to do that? Thanks.
> 
By patching the completer to use portable syntax, portable in terms of zsh.
The following patch applied to master should work in pre 5.1.

Considering that this is the only line in _git that expects the reserved word behavior,
it may be a good idea to commit it for consistency sake. But bart has a point.

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index b7eaf2e..fb10fa6 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1129,9 +1129,9 @@ _git-log () {

 (( $+functions[_git-merge] )) ||
 _git-merge () {
-  local -a merge_options
+  local -a merge_options git_commit_opts
   __git_setup_merge_options
-  local -a git_commit_opts=(--all --not HEAD --not)
+  git_commit_opts=(--all --not HEAD --not)

   _arguments -w -S -s \
     $merge_options \