From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-25500-mason-zsh=primenet.com.au@sunsite.dk>
Received: (qmail 25360 invoked from network); 21 Aug 2008 11:44:10 -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; 21 Aug 2008 11:44:10 -0000
Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts)
Received: (qmail 18090 invoked from network); 21 Aug 2008 11:43:42 -0000
Received: from sunsite.dk (130.225.247.90)
  by a.mx.sunsite.dk with SMTP; 21 Aug 2008 11:43:42 -0000
Received: (qmail 2321 invoked by alias); 21 Aug 2008 11:43:21 -0000
Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm
Precedence: bulk
X-No-Archive: yes
X-Seq: 25500
Received: (qmail 2303 invoked from network); 21 Aug 2008 11:43:19 -0000
Received: from bifrost.dotsrc.org (130.225.254.106)
  by sunsite.dk with SMTP; 21 Aug 2008 11:43:19 -0000
Received: from ik-out-1112.google.com (ik-out-1112.google.com [66.249.90.183])
	by bifrost.dotsrc.org (Postfix) with ESMTP id 4C423801E2B4
	for <zsh-workers@sunsite.dk>; Thu, 21 Aug 2008 13:43:15 +0200 (CEST)
Received: by ik-out-1112.google.com with SMTP id c28so726308ika.5
        for <zsh-workers@sunsite.dk>; Thu, 21 Aug 2008 04:43:15 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=gamma;
        h=domainkey-signature:received:received:message-id:date:from:to
         :subject:mime-version:content-type:content-transfer-encoding
         :content-disposition;
        bh=tMk7+gcyu3WYRfemonHB1RmbjLVgTVgkLrQvs4RD+f4=;
        b=kzFXgsJBcix5qOgZGa/Os3s2Ye9mlyI8LoN1KVGOXbGfN4qqbiCOdhdziTUktwTZ0k
         QeyMHuEWrBB0CdP2YlhmpK5bKDGiMiN7/+sYFx9RqAdEvgoZtHOK5nQGhGTx3PESjMpq
         Y9Mvm8XTD4fKZwRefX9NCtI07D49O/MvjQBZg=
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=message-id:date:from:to:subject:mime-version:content-type
         :content-transfer-encoding:content-disposition;
        b=KqgzpdmhoEpiUlV4LkuOt+ROr1D4dedaDjTvHY/loB0H0TYLMREOEb+oWqhyvdYtSE
         oWj6hTSJ/s0G1MPYBepPlq+I/7pSwPgP4qViiq1NLCV+Xr2Bx9zdn3RilFPI/oAu4Uhz
         HUWVZsmzkukbIYF4LjQq+V6UdyNlQ10kpuDnY=
Received: by 10.210.71.12 with SMTP id t12mr1793021eba.146.1219318995568;
        Thu, 21 Aug 2008 04:43:15 -0700 (PDT)
Received: by 10.210.19.20 with HTTP; Thu, 21 Aug 2008 04:43:15 -0700 (PDT)
Message-ID: <237967ef0808210443y542c4794v50c5ea0eb1a308f@mail.gmail.com>
Date: Thu, 21 Aug 2008 13:43:15 +0200
From: "Mikael Magnusson" <mikachu@gmail.com>
To: zsh-workers <zsh-workers@sunsite.dk>
Subject: _git: Update __git_merge_strategies to work with new git.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
X-Virus-Scanned: ClamAV 0.92.1/8061/Thu Aug 21 02:00:17 2008 on bifrost
X-Virus-Status: Clean

This is the corresponding code from the bundled bash-completion:
    git merge -s help 2>&1 |
    sed -n -e '/[Aa]vailable strategies are: /,/^$/{
            s/\.$//
            s/.*://
            s/^[    ]*//
            s/[     ]*$//
            p
    }'

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 7e48c19..c799a40 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -4046,7 +4046,7 @@ __git_gpg_secret_keys () {
 __git_merge_strategies () {
   declare -a merge_strategies_cache

-  merge_strategies_cache=(${${=${${(M)${(f)"$(<$(git
--exec-path)/git-merge)"}:#all_strategies*}##all_strategies=\'}%%\'}:#recur})
+  merge_strategies_cache=(${(s: :)${${${${(ps:\n:)"$(git merge -s ''
2>&1)"}[(r)Available strategies are: *,(r)]}%%.}##*: }})

   local expl
   _wanted merge-strategies expl 'merge strategy' compadd -
$merge_strategies_cache


-- 
Mikael Magnusson