From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-37998-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 5139 invoked by alias); 16 Feb 2016 10:49:48 -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: 37998
Received: (qmail 13991 invoked from network); 16 Feb 2016 10:49:45 -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 autolearn=ham
	autolearn_force=no version=3.4.1
Date: Tue, 16 Feb 2016 10:49:39 +0000
From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: Thomas Becker <twbecker@gmail.com>
Cc: zsh-workers@zsh.org
Subject: Re: Bug in completion for git merge
Message-ID: <20160216104939.GA11867@tarsus.local2>
References: <6E7E611B-CA0B-4F79-B775-7D100CA9017B@gmail.com>
 <160215085854.ZM27144@torch.brasslantern.com>
 <8D34A413-897D-4D27-8FD4-4958FC0A90C4@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <8D34A413-897D-4D27-8FD4-4958FC0A90C4@gmail.com>
User-Agent: Mutt/1.5.23 (2014-03-12)

Thomas Becker wrote on Mon, Feb 15, 2016 at 12:20:33 -0500:
> 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.

Install the latest binary, not just the latest $fpath.

    git clone git://git.code.sf.net/p/zsh/code zsh
    cd zsh
    git checkout zsh-5.2
    Util/preconfig && ./configure && make all check install