From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-37031-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 11342 invoked by alias); 31 Oct 2015 13:02:34 -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: 37031
Received: (qmail 15408 invoked from network); 31 Oct 2015 13:02:32 -0000
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID
	autolearn=ham autolearn_force=no version=3.4.0
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=
	daniel.shahaf.name; h=cc:content-type:date:from:message-id
	:mime-version:subject:to:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=yAq
	RIx7n9PfHiHlXHSajzJOWF0c=; b=0xV9WBxHsvcBaDOg6MgkcPtlEROaCEXxO45
	KTH5HXlYdTUEgHGRJ3JMC8sBsOk3nt2pFlqTviEr1sa+IiMR86BQLt9YrMSiMwr/
	N9x+tgx4TOTAcMIu/YuggLLmvpS1IcxZBhENlLj/8Xodx6g853B1Ixlq0peDB38s
	Hylhhtnk=
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=
	messagingengine.com; h=cc:content-type:date:from:message-id
	:mime-version:subject:to:x-sasl-enc:x-sasl-enc; s=smtpout; bh=yA
	qRIx7n9PfHiHlXHSajzJOWF0c=; b=VJl0zA1uQ12Wilbh1iRVPqFdGrk7CGN0Zj
	wHpvPkFu9BBcV8HcfpC9lL75u21h4z9hFQU/CawnmgOXOxS4r5caxUjPbXUFQXpk
	wEpC52L76op7s7M0Q6zKpIIrW4LLXQw2QgV5VzCHRdZrsJ/wTZwrjcinBjMn76my
	K+uinOEpI=
X-Sasl-enc: /eNvEYfWNJ70ajAW1aW5m1jcuTgY2WxuxHjRX3a27taZ 1446295977
Date: Sat, 31 Oct 2015 12:52:46 +0000
From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Cc: Mateusz Karbowy <mateusz.karbowy@gmail.com>
Subject: [PATCH] _git-merge: Exclude ancestors of HEAD from recent commit
 completion
Message-ID: <20151031125246.GA3138@tarsus.local2>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.21 (2010-09-15)

As done for _git-cherry-pick in a428c6b62cb2 (36328 + 36340).

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index ad1037e..110f154 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1131,6 +1131,7 @@ _git-log () {
 _git-merge () {
   local -a merge_options
   __git_setup_merge_options
+  local -a git_commit_opts=(--all --not HEAD --not)
 
   _arguments -w -S -s \
     $merge_options \
@@ -1138,7 +1139,7 @@ _git-merge () {
     '(                    --no-rerere-autoupdate)--rerere-autoupdate[allow the rerere mechanism to update the index]' \
     '(--rerere-autoupdate                       )--no-rerere-autoupdate[do not allow the rerere mechanism to update the index]' \
     '--abort[restore the original branch and abort the merge operation]' \
-    '*: :__git_commits'
+    '*: : __git_commits -O expl:git_commit_opts'
 }
 
 (( $+functions[_git-mv] )) ||