From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-25521-mason-zsh=primenet.com.au@sunsite.dk>
Received: (qmail 12095 invoked from network); 24 Aug 2008 19:42:46 -0000
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham
	version=3.2.5
Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88)
  by ns1.primenet.com.au with SMTP; 24 Aug 2008 19:42:46 -0000
Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts)
Received: (qmail 78914 invoked from network); 24 Aug 2008 19:42:39 -0000
Received: from sunsite.dk (130.225.247.90)
  by a.mx.sunsite.dk with SMTP; 24 Aug 2008 19:42:39 -0000
Received: (qmail 1174 invoked by alias); 24 Aug 2008 19:42:35 -0000
Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm
Precedence: bulk
X-No-Archive: yes
X-Seq: 25521
Received: (qmail 1164 invoked from network); 24 Aug 2008 19:42:34 -0000
Received: from bifrost.dotsrc.org (130.225.254.106)
  by sunsite.dk with SMTP; 24 Aug 2008 19:42:34 -0000
Received: from cork.scru.org (cork.scru.org [209.20.67.2])
	by bifrost.dotsrc.org (Postfix) with ESMTPS id 858BD8030846
	for <zsh-workers@sunsite.dk>; Sun, 24 Aug 2008 21:42:30 +0200 (CEST)
Received: by cork.scru.org (Postfix, from userid 1000)
	id A849010408B; Sun, 24 Aug 2008 19:42:26 +0000 (UTC)
Date: Sun, 24 Aug 2008 19:42:26 +0000
From: Clint Adams <clint@zsh.org>
To: zsh-workers <zsh-workers@sunsite.dk>
Subject: Re: _git: Update __git_merge_strategies to work with new git.
Message-ID: <20080824194226.GA23589@scru.org>
Mail-Followup-To: zsh-workers <zsh-workers@sunsite.dk>
References: <237967ef0808210443y542c4794v50c5ea0eb1a308f@mail.gmail.com> <20080821122947.GA4065@scru.org> <237967ef0808211319u42388b15w330c324e3f8043e@mail.gmail.com> <20080822103622.GA31581@scru.org> <237967ef0808220841x635d8180n7c1b46ab682c8869@mail.gmail.com> <20080824163658.GA20363@scru.org> <237967ef0808241140r20c09376wfcee421ac1db7e6b@mail.gmail.com> <20080824191244.GA23476@scru.org> <237967ef0808241216t5a8e3b3t17756e52e15e3628@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <237967ef0808241216t5a8e3b3t17756e52e15e3628@mail.gmail.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
X-Virus-Scanned: ClamAV 0.92.1/8082/Sun Aug 24 18:40:03 2008 on bifrost
X-Virus-Status: Clean

On Sun, Aug 24, 2008 at 09:16:13PM +0200, Mikael Magnusson wrote:
> The git-bundled bash completion doesn't exclude it at any rate.

The other issue is that the git merge -s '' trick doesn't work outside
of git directories.

So maybe this is the way to go.

Index: Completion/Unix/Command/_git
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_git,v
retrieving revision 1.88
diff -u -r1.88 _git
--- Completion/Unix/Command/_git	21 Aug 2008 12:25:26 -0000	1.88
+++ Completion/Unix/Command/_git	24 Aug 2008 19:40:39 -0000
@@ -4039,12 +4039,14 @@
 
 (( $+functions[__git_merge_strategies] )) ||
 __git_merge_strategies () {
-  declare -a merge_strategies_cache
+  local expl
+  local -a merge_strategies
 
-  merge_strategies_cache=(${${=${${(M)${(f)"$(<$(git --exec-path)/git-merge)"}:#all_strategies*}##all_strategies=\'}%%\'}:#recur})
+  if ! merge_strategies=(${=${${(M)${(f)"$(_call_program strategies git merge -s '' 2>&1)"}:#[Aa]vailable (custom )#strategies are: *}#[Aa]vailable (custom )#strategies are: }%.}); then
+    merge_strategies=(${=${${(M)${(f)"$(<$(git --exec-path)/git-merge)"}:#all_strategies*}##all_strategies=\'}%%\'})
+  fi
 
-  local expl
-  _wanted merge-strategies expl 'merge strategy' compadd - $merge_strategies_cache
+  _wanted merge-strategies expl 'merge strategy' compadd -a merge_strategies "$@"
 }
 
 # TODO: Use this in more places.